diff options
| author | Benjamin Otte <otte@redhat.com> | 2013-04-22 17:37:05 -0400 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2013-04-22 18:29:01 -0400 |
| commit | 3450388ff03794ef4c4e7c24e91bfb40798dbec5 (patch) | |
| tree | 5e1ac6eb992437e320d57f466e481e831b9d1b53 /gtk/gtkpaned.c | |
| parent | 009aadf378150c32aed9347bbffffda2ca0af6f2 (diff) | |
| download | gtk+-3450388ff03794ef4c4e7c24e91bfb40798dbec5.tar.gz | |
sizerequest: Split out a common function
Diffstat (limited to 'gtk/gtkpaned.c')
| -rw-r--r-- | gtk/gtkpaned.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 7c5ec381f3..4d16e4fe02 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -35,6 +35,7 @@ #include "gtkorientableprivate.h" #include "gtkprivate.h" #include "gtkintl.h" +#include "gtkwidgetprivate.h" #include "a11y/gtkpanedaccessible.h" /** @@ -870,25 +871,6 @@ gtk_paned_finalize (GObject *object) } static void -get_preferred_size_for_size (GtkWidget *widget, - GtkOrientation orientation, - gint size, - gint *minimum, - gint *natural) -{ - if (orientation == GTK_ORIENTATION_HORIZONTAL) - if (size < 0) - gtk_widget_get_preferred_width (widget, minimum, natural); - else - gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural); - else - if (size < 0) - gtk_widget_get_preferred_height (widget, minimum, natural); - else - gtk_widget_get_preferred_height_for_width (widget, size, minimum, natural); -} - -static void gtk_paned_get_preferred_size (GtkWidget *widget, GtkOrientation orientation, gint size, @@ -903,7 +885,7 @@ gtk_paned_get_preferred_size (GtkWidget *widget, if (priv->child1 && gtk_widget_get_visible (priv->child1)) { - get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat); + _gtk_widget_get_preferred_size_for_size (priv->child1, orientation, size, &child_min, &child_nat); if (priv->child1_shrink && priv->orientation == orientation) *minimum = 0; else @@ -913,7 +895,7 @@ gtk_paned_get_preferred_size (GtkWidget *widget, if (priv->child2 && gtk_widget_get_visible (priv->child2)) { - get_preferred_size_for_size (priv->child2, orientation, size, &child_min, &child_nat); + _gtk_widget_get_preferred_size_for_size (priv->child2, orientation, size, &child_min, &child_nat); if (priv->orientation == orientation) { |