X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-hbuttonbox.c;h=93f8990e6f66f5ff8a275106d05d59dbc519691a;hb=870b099b7272c4440f9df2a0741902f035af3f51;hp=d200b9d0879fcec5d41932c8d972d4e56e83235c;hpb=20f28c180d171a2f0e707c274b249d90f8d903e0;p=pspp

diff --git a/src/ui/gui/psppire-hbuttonbox.c b/src/ui/gui/psppire-hbuttonbox.c
index d200b9d087..93f8990e6f 100644
--- a/src/ui/gui/psppire-hbuttonbox.c
+++ b/src/ui/gui/psppire-hbuttonbox.c
@@ -37,7 +37,33 @@ static void gtk_hbutton_box_size_allocate (GtkWidget      *widget,
 					   GtkAllocation  *allocation);
 
 
-static const GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
+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)
@@ -73,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;
 }
 
@@ -115,8 +142,7 @@ gtk_hbutton_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,
@@ -137,14 +163,12 @@ gtk_hbutton_box_size_request (GtkWidget      *widget,
       requisition->width =
 	      nvis_children*child_width + ((nvis_children+1)*spacing);
       break;
+    default:
     case GTK_BUTTONBOX_EDGE:
     case GTK_BUTTONBOX_START:
     case GTK_BUTTONBOX_END:
       requisition->width = nvis_children*child_width + ((nvis_children-1)*spacing);
       break;
-    default:
-      g_assert_not_reached();
-      break;
     }
 
     requisition->height = child_height;
@@ -180,8 +204,7 @@ gtk_hbutton_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,
@@ -196,6 +219,7 @@ gtk_hbutton_box_size_allocate (GtkWidget     *widget,
     x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)) + childspacing;
     secondary_x = x + ((nvis_children - n_secondaries) * (child_width + childspacing));
     break;
+  default:
   case GTK_BUTTONBOX_EDGE:
     if (nvis_children >= 2)
       {
@@ -226,9 +250,6 @@ gtk_hbutton_box_size_allocate (GtkWidget     *widget,
       - gtk_container_get_border_width (GTK_CONTAINER (box));
     secondary_x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box));
     break;
-  default:
-    g_assert_not_reached();
-    break;
   }