[gimp/gtk3-port: 38/226] app: use gtk_widget_get_preferred_size() instead of size_request()



commit ae1d967728d6a515f426a8dd228145c5ade8a371
Author: Michael Natterer <mitch gimp org>
Date:   Tue Oct 19 12:23:37 2010 +0200

    app: use gtk_widget_get_preferred_size() instead of size_request()

 app/display/gimpstatusbar.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 5a342d6..81c8919 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -319,30 +319,36 @@ gimp_statusbar_hbox_size_request (GtkWidget      *widget,
 
   /*  also consider the children which can be invisible  */
 
-  gtk_widget_size_request (statusbar->cursor_label, &child_requisition);
+  gtk_widget_get_preferred_size (statusbar->cursor_label,
+                                 &child_requisition, NULL);
   width += child_requisition.width;
   requisition->height = MAX (requisition->height,
                              child_requisition.height);
 
-  gtk_widget_size_request (statusbar->unit_combo, &child_requisition);
+  gtk_widget_get_preferred_size (statusbar->unit_combo,
+                                 &child_requisition, NULL);
   width += child_requisition.width;
   requisition->height = MAX (requisition->height,
                              child_requisition.height);
 
-  gtk_widget_size_request (statusbar->scale_combo, &child_requisition);
+  gtk_widget_get_preferred_size (statusbar->scale_combo,
+                                 &child_requisition, NULL);
   width += child_requisition.width;
   requisition->height = MAX (requisition->height,
                              child_requisition.height);
 
-  gtk_widget_size_request (statusbar->progressbar, &child_requisition);
+  gtk_widget_get_preferred_size (statusbar->progressbar,
+                                 &child_requisition, NULL);
   requisition->height = MAX (requisition->height,
                              child_requisition.height);
 
-  gtk_widget_size_request (statusbar->label, &child_requisition);
+  gtk_widget_get_preferred_size (statusbar->label,
+                                 &child_requisition, NULL);
   requisition->height = MAX (requisition->height,
                              child_requisition.height);
 
-  gtk_widget_size_request (statusbar->cancel_button, &child_requisition);
+  gtk_widget_get_preferred_size (statusbar->cancel_button,
+                                 &child_requisition, NULL);
   requisition->height = MAX (requisition->height,
                              child_requisition.height);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]