X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/981a80493a7eb930da1792bef310f89e312dd367..acd32ffcdb319f162633c20e0202db3f8542998a:/src/gtk/win_gtk.cpp?ds=sidebyside

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index 980bd28850..13f596d26c 100644
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -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,9 +107,7 @@ 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);
         }
     }
@@ -259,13 +259,6 @@ static void class_init(void* g_class, void*)
             G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 
     parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent(g_class));
-
-    gtk_widget_class_install_style_property (widget_class,
-					   g_param_spec_boolean ("row-ending-details",
-								 "Row Ending details",
-								 "Enable extended row background theming",
-								 FALSE,
-								 G_PARAM_READABLE));
 }
 
 } // extern "C"
@@ -289,10 +282,11 @@ GType wxPizza::type()
     return type;
 }
 
-GtkWidget* wxPizza::New(long windowStyle)
+GtkWidget* wxPizza::New(long windowStyle,void* owner)
 {
     GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
     wxPizza* pizza = WX_PIZZA(widget);
+    pizza->m_owner = owner;
     pizza->m_backing_window = NULL;
     pizza->m_scroll_x = 0;
     pizza->m_scroll_y = 0;