handle theme change which changes window border width

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index bf4bd7fc2d6c7b080b277aeeeee5e026993d901b..256e94f60ca32fff7c8369b9c0488462643cd9f1 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -39,34 +39,36 @@ struct wxPizzaClass
 
 static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
 {
-    const bool is_resize =
-        widget->allocation.width  != alloc->width ||
-        widget->allocation.height != alloc->height;
-    const bool is_move =
-        widget->allocation.x != alloc->x ||
-        widget->allocation.y != alloc->y;
-
     wxPizza* pizza = WX_PIZZA(widget);
     int border_x, border_y;
     pizza->get_border_widths(border_x, border_y);
     int w = alloc->width - 2 * border_x;
     if (w < 0) w = 0;
 
-    if (gtk_widget_get_realized(widget) && (is_move || is_resize))
+    if (gtk_widget_get_realized(widget))
     {
         int h = alloc->height - 2 * border_y;
         if (h < 0) h = 0;
+        const int x = alloc->x + border_x;
+        const int y = alloc->y + border_y;
 
-        gdk_window_move_resize(widget->window,
-            alloc->x + border_x, alloc->y + border_y, w, h);
+        GdkWindow* window = gtk_widget_get_window(widget);
+        int old_x, old_y;
+        gdk_window_get_position(window, &old_x, &old_y);
 
-        if (is_resize && (border_x || border_y))
+        if (x != old_x || y != old_y ||
+            w != gdk_window_get_width(window) || h != gdk_window_get_height(window))
         {
-            // old and new border areas need to be invalidated,
-            // otherwise they will not be erased/redrawn properly
-            GdkWindow* parent = gtk_widget_get_parent_window(widget);
-            gdk_window_invalidate_rect(parent, &widget->allocation, false);
-            gdk_window_invalidate_rect(parent, alloc, false);
+            gdk_window_move_resize(window, x, y, w, h);
+
+            if (border_x + border_y)
+            {
+                // old and new border areas need to be invalidated,
+                // otherwise they will not be erased/redrawn properly
+                GdkWindow* parent = gtk_widget_get_parent_window(widget);
+                gdk_window_invalidate_rect(parent, &widget->allocation, false);
+                gdk_window_invalidate_rect(parent, alloc, false);
+            }
         }
     }
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 526a47f492770f541725fa3f955cb2ce2e086b55..671258bf8cd2de9c421e693ba603337dc740b06e 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1950,10 +1950,18 @@ void gtk_window_style_set_callback( GtkWidget *WXUNUSED(widget),
 {
     if (win && previous_style)
     {
-        wxSysColourChangedEvent event;
-        event.SetEventObject(win);
-
-        win->GTKProcessEvent( event );
+        if (win->IsTopLevel())
+        {
+            wxSysColourChangedEvent event;
+            event.SetEventObject(win);
+            win->GTKProcessEvent(event);
+        }
+        else
+        {
+            // Border width could change, which will change client size.
+            // Make sure size event occurs for this
+            win->m_oldClientWidth = 0;
+        }
     }
 }
 
@@ -2479,7 +2487,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
     g_signal_connect (widget, "leave_notify_event",
                       G_CALLBACK (gtk_window_leave_callback), this);
 
-    if (IsTopLevel() && m_wxwindow)
+    if (m_wxwindow && (IsTopLevel() || HasFlag(wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME)))
         g_signal_connect (m_wxwindow, "style_set",
                               G_CALLBACK (gtk_window_style_set_callback), this);
 }