[gtk+/wip/otte/queue-resize: 13/33] sizegroup: Fold function into only caller



commit b967f6a3133a1652b09dfe16f41129c45968700f
Author: Benjamin Otte <otte redhat com>
Date:   Tue Sep 15 22:08:55 2015 +0200

    sizegroup: Fold function into only caller

 gtk/gtksizegroup.c |   46 ++++++++++++++++++----------------------------
 1 files changed, 18 insertions(+), 28 deletions(-)
---
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 84a0ee9..8732beb 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -204,33 +204,6 @@ _gtk_size_group_get_widget_peers (GtkWidget      *for_widget,
 }
 
 static void
-gtk_container_queue_resize (GtkContainer *container)
-{
-  GtkWidget *widget;
-
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-
-  widget = GTK_WIDGET (container);
-
-  do
-    {
-      _gtk_widget_set_alloc_needed (widget, TRUE);
-      _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
-
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      if (GTK_IS_RESIZE_CONTAINER (widget))
-        break;
-      G_GNUC_END_IGNORE_DEPRECATIONS;
-
-      widget = gtk_widget_get_parent (widget);
-    }
-  while (widget);
-
-  if (widget)
-    gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
-}
-
-static void
 real_queue_resize (GtkWidget *widget)
 {
   GtkWidget *container;
@@ -245,7 +218,24 @@ real_queue_resize (GtkWidget *widget)
 
   if (container)
     {
-      gtk_container_queue_resize (GTK_CONTAINER (container));
+      widget = container;
+
+      do
+        {
+          _gtk_widget_set_alloc_needed (widget, TRUE);
+          _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
+
+          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+          if (GTK_IS_RESIZE_CONTAINER (widget))
+            break;
+          G_GNUC_END_IGNORE_DEPRECATIONS;
+
+          widget = gtk_widget_get_parent (widget);
+        }
+      while (widget);
+
+      if (widget)
+        gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
     }
 }
 


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