X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7b63a01e9bf64f1d9ff3f39d01bb7800032c44b..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/gtk/win_gtk.cpp diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index acace1f565..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(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); } } @@ -282,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;