]> git.saurik.com Git - wxWidgets.git/commitdiff
Prevent surplus calls of _size_allocate() if no change
authorRobert Roebling <robert@roebling.de>
Fri, 23 Jan 2009 13:04:17 +0000 (13:04 +0000)
committerRobert Roebling <robert@roebling.de>
Fri, 23 Jan 2009 13:04:17 +0000 (13:04 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/win_gtk.cpp

index 980bd28850ebed996399bbf54ef63841ac602445..0ef51eb2bdf680ebb9f684c4b9700bfa8f35ba88 100644 (file)
@@ -87,13 +87,15 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
     }
 
     widget->allocation = *alloc;
-
+    
     // adjust child positions
     for (const GList* list = pizza->m_fixed.children; list; list = list->next)
     {
         const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
         if (GTK_WIDGET_VISIBLE(child->widget))
         {
+            GtkAllocation child_old_alloc = child->widget->allocation;
+        
             GtkAllocation child_alloc;
             // note that child positions do not take border into
             // account, they need to be relative to widget->window,
@@ -105,10 +107,13 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
             child_alloc.width  = req.width;
             child_alloc.height = req.height;
             if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
-            {
                 child_alloc.x = w - child_alloc.x - child_alloc.width;
-            }
-            gtk_widget_size_allocate(child->widget, &child_alloc);
+                
+            if ((child_alloc.x != child_old_alloc.x) ||
+                (child_alloc.y != child_old_alloc.y) ||
+                (child_alloc.width != child_old_alloc.width) ||
+                (child_alloc.height != child_old_alloc.height))
+                gtk_widget_size_allocate(child->widget, &child_alloc);
         }
     }
 }