X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ca41b1ea89c0e6ccf84973091bea8b936eee06..0738b901b17340f09766524b8d9d79e9ed1268e7:/src/gtk/win_gtk.cpp diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 13f596d26c..729463a3ad 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -87,7 +87,7 @@ 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) { @@ -95,7 +95,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc) 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, @@ -342,7 +342,7 @@ static void scroll_adjust(GtkWidget* widget, void* data) const AdjustData* p = static_cast(data); widget->allocation.x += p->dx; widget->allocation.y += p->dy; - + if (widget->window == p->window) { // GtkFrame requires a queue_resize, otherwise parts of @@ -377,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;