fixing setting initial value under osx_cocoa for single line text controls

[wxWidgets.git] / src / gtk / win_gtk.cpp

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index 980bd28850ebed996399bbf54ef63841ac602445..729463a3adb2cf225be0feeb80d8dd30dfc7adb5 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -94,6 +94,8 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
         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;
@@ -348,7 +342,7 @@ static void scroll_adjust(GtkWidget* widget, void* data)
     const AdjustData* p = static_cast<AdjustData*>(data);
     widget->allocation.x += p->dx;
     widget->allocation.y += p->dy;
-    
+
     if (widget->window == p->window)
     {
         // GtkFrame requires a queue_resize, otherwise parts of
@@ -383,24 +377,24 @@ void wxPizza::get_border_widths(int& x, int& y)
     x = y = 0;
     if (m_border_style == 0)
         return;
-        
+
 #ifndef __WXUNIVERSAL__
     if (m_border_style & wxBORDER_SIMPLE)
         x = y = 1;
-    else if (m_is_scrollable || (m_border_style & wxBORDER_THEME))
+    else if (m_is_scrollable /* || (m_border_style & wxBORDER_THEME) */)
     {
         GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();
-            
+
         if (style_widget->style)
         {
             x = style_widget->style->xthickness;
             y = style_widget->style->ythickness;
         }
     }
-    else 
+    else
     {
         GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget();
-            
+
         if (style_widget->style)
         {
             x = style_widget->style->xthickness;