From 65b7004520b7853431f7cb6c378840e1232aba77 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 27 May 2013 14:00:22 +0200
Subject: [PATCH] Psppire*ButtonBox: replace size_request with
 get_preferred_height/width

---
 src/ui/gui/psppire-hbuttonbox.c | 30 +++++++++++++++++++++++++++++-
 src/ui/gui/psppire-vbuttonbox.c | 29 ++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/ui/gui/psppire-hbuttonbox.c b/src/ui/gui/psppire-hbuttonbox.c
index c86d470725..93f8990e6f 100644
--- a/src/ui/gui/psppire-hbuttonbox.c
+++ b/src/ui/gui/psppire-hbuttonbox.c
@@ -37,6 +37,33 @@ static void gtk_hbutton_box_size_allocate (GtkWidget      *widget,
 					   GtkAllocation  *allocation);
 
 
+static void
+psppire_hbutton_box_get_preferred_height (GtkWidget *widget,
+                                gint      *minimal_height,
+                                gint      *natural_height)
+{
+  GtkRequisition requisition;
+
+  gtk_hbutton_box_size_request (widget, &requisition);
+
+  *minimal_height = *natural_height = requisition.height;
+}
+
+
+static void
+psppire_hbutton_box_get_preferred_width (GtkWidget *widget,
+                                gint      *minimal_width,
+                                gint      *natural_width)
+{
+  GtkRequisition requisition;
+
+  gtk_hbutton_box_size_request (widget, &requisition);
+
+  *minimal_width = *natural_width = requisition.width;
+}
+
+
+
 
 GType
 psppire_hbutton_box_get_type (void)
@@ -72,7 +99,8 @@ psppire_hbuttonbox_class_init (PsppireHButtonBoxClass *class)
 
   widget_class = (GtkWidgetClass*) class;
 
-  widget_class->size_request = gtk_hbutton_box_size_request;
+  widget_class->get_preferred_width = psppire_hbutton_box_get_preferred_width;
+  widget_class->get_preferred_height = psppire_hbutton_box_get_preferred_height;
   widget_class->size_allocate = gtk_hbutton_box_size_allocate;
 }
 
diff --git a/src/ui/gui/psppire-vbuttonbox.c b/src/ui/gui/psppire-vbuttonbox.c
index 8c6d25afbe..72e6585689 100644
--- a/src/ui/gui/psppire-vbuttonbox.c
+++ b/src/ui/gui/psppire-vbuttonbox.c
@@ -37,6 +37,32 @@ static void gtk_vbutton_box_size_allocate (GtkWidget      *widget,
 					   GtkAllocation  *allocation);
 
 
+static void
+psppire_vbutton_box_get_preferred_height (GtkWidget *widget,
+                                gint      *minimal_height,
+                                gint      *natural_height)
+{
+  GtkRequisition requisition;
+
+  gtk_vbutton_box_size_request (widget, &requisition);
+
+  *minimal_height = *natural_height = requisition.height;
+}
+
+
+static void
+psppire_vbutton_box_get_preferred_width (GtkWidget *widget,
+                                gint      *minimal_width,
+                                gint      *natural_width)
+{
+  GtkRequisition requisition;
+
+  gtk_vbutton_box_size_request (widget, &requisition);
+
+  *minimal_width = *natural_width = requisition.width;
+}
+
+
 GType
 psppire_vbutton_box_get_type (void)
 {
@@ -71,7 +97,8 @@ psppire_vbuttonbox_class_init (PsppireVButtonBoxClass *class)
 
   widget_class = (GtkWidgetClass*) class;
 
-  widget_class->size_request = gtk_vbutton_box_size_request;
+  widget_class->get_preferred_width = psppire_vbutton_box_get_preferred_width;
+  widget_class->get_preferred_height = psppire_vbutton_box_get_preferred_height;
   widget_class->size_allocate = gtk_vbutton_box_size_allocate;
 }
 
-- 
2.30.2