fixed the scroll-to-bottom; removed the size-request signal warning

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

diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c
index a9480a331198e450fa5a5056531d76edbba79040..ca3c4cd8312dbb30d6f2ad23a579456439a69ae2 100644 (file)
--- a/src/ui/gui/psppire-buttonbox.c
+++ b/src/ui/gui/psppire-buttonbox.c
@@ -446,14 +446,10 @@ _psppire_button_box_child_requisition (GtkWidget *widget,
                         "child-internal-pad-y", &ipad_y_default,
                        NULL);
 
-  child_min_width = bbox->child_min_width   != GTK_BUTTONBOX_DEFAULT
-    ? bbox->child_min_width : width_default;
-  child_min_height = bbox->child_min_height !=GTK_BUTTONBOX_DEFAULT
-    ? bbox->child_min_height : height_default;
-  ipad_x = bbox->child_ipad_x != GTK_BUTTONBOX_DEFAULT
-    ? bbox->child_ipad_x : ipad_x_default;
-  ipad_y = bbox->child_ipad_y != GTK_BUTTONBOX_DEFAULT
-    ? bbox->child_ipad_y : ipad_y_default;
+  child_min_width = width_default;
+  child_min_height = height_default;
+  ipad_x = ipad_x_default;
+  ipad_y = ipad_y_default;
 
   nchildren = 0;
   nsecondaries = 0;
@@ -473,7 +469,7 @@ _psppire_button_box_child_requisition (GtkWidget *widget,
        {
           gboolean is_secondary = FALSE;
          nchildren += 1;
-         gtk_widget_size_request (child, &child_requisition);
+         gtk_widget_get_preferred_size (child, NULL, &child_requisition);
 
          if (child_requisition.width + ipad_w > needed_width)
            needed_width = child_requisition.width + ipad_w;