Merge 'master' into 'gtk3'.

[pspp] / src / ui / gui / psppire-vbuttonbox.c

diff --git a/src/ui/gui/psppire-vbuttonbox.c b/src/ui/gui/psppire-vbuttonbox.c
index 2af878f38e967c03819d8c6545be514b2a03f103..72e65856891fc3335b78461d6ea07020d5650d3c 100644 (file)
--- a/src/ui/gui/psppire-vbuttonbox.c
+++ b/src/ui/gui/psppire-vbuttonbox.c
@@ -37,7 +37,31 @@ static void gtk_vbutton_box_size_allocate (GtkWidget      *widget,
                                           GtkAllocation  *allocation);
 
 
-static const GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
+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)
@@ -73,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;
 }
 
@@ -115,8 +140,7 @@ gtk_vbutton_box_size_request (GtkWidget      *widget,
   bbox = GTK_BUTTON_BOX (widget);
 
   spacing = gtk_box_get_spacing (box);
-  layout = gtk_button_box_get_layout (bbox) != GTK_BUTTONBOX_DEFAULT_STYLE
-         ? gtk_button_box_get_layout (bbox) : default_layout_style;
+  layout = gtk_button_box_get_layout (bbox);
 
   _psppire_button_box_child_requisition (widget,
                                         &nvis_children,
@@ -140,12 +164,10 @@ gtk_vbutton_box_size_request (GtkWidget      *widget,
       case GTK_BUTTONBOX_EDGE:
       case GTK_BUTTONBOX_START:
       case GTK_BUTTONBOX_END:
+      default:
         requisition->height =
                nvis_children*child_height + ((nvis_children-1)*spacing);
        break;
-      default:
-           g_assert_not_reached();
-           break;
       }
       requisition->width = child_width;
     }
@@ -180,8 +202,7 @@ gtk_vbutton_box_size_allocate (GtkWidget     *widget,
   base_box = GTK_BOX (widget);
   box = GTK_BUTTON_BOX (widget);
   spacing = gtk_box_get_spacing (base_box);
-  layout = gtk_button_box_get_layout (box) != GTK_BUTTONBOX_DEFAULT_STYLE
-         ? gtk_button_box_get_layout (box) : default_layout_style;
+  layout = gtk_button_box_get_layout (box) ;
   _psppire_button_box_child_requisition (widget,
                                      &nvis_children,
                                     &n_secondaries,
@@ -197,6 +218,7 @@ gtk_vbutton_box_size_allocate (GtkWidget     *widget,
     secondary_y = y + ((nvis_children - n_secondaries) * (child_height + childspacing));
     break;
   case GTK_BUTTONBOX_EDGE:
+  default:
     if (nvis_children >= 2)
       {
         childspacing = (height - (nvis_children*child_height)) / (nvis_children-1);
@@ -226,9 +248,6 @@ gtk_vbutton_box_size_allocate (GtkWidget     *widget,
       - gtk_container_get_border_width (GTK_CONTAINER (box));
     secondary_y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box));
     break;
-  default:
-    g_assert_not_reached();
-    break;
   }
 
   x = allocation->x + (allocation->width - child_width) / 2;