Commited fix for wrong background colour in TLWs. I don't

   know if this will play well with themes. Alternatively,
   one could change one of the few lines below to parent == this;

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 2ffbc1a024f8dc9040098ccbff15c03f786e5146..558f67a6997276179c915195bcf2d7e03222867e 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3971,7 +3971,7 @@ void wxWindowGTK::GtkSendPaintEvents()
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
 
-    if (GetThemeEnabled() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM)
+    if (GetThemeEnabled() && (GetBackgroundStyle() == wxBG_STYLE_SYSTEM) && !IsTopLevel())
     {
         // find ancestor from which to steal background
         wxWindow *parent = GetParent();

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 2ffbc1a024f8dc9040098ccbff15c03f786e5146..558f67a6997276179c915195bcf2d7e03222867e 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -3971,7 +3971,7 @@ void wxWindowGTK::GtkSendPaintEvents()
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
 
-    if (GetThemeEnabled() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM)
+    if (GetThemeEnabled() && (GetBackgroundStyle() == wxBG_STYLE_SYSTEM) && !IsTopLevel())
     {
         // find ancestor from which to steal background
         wxWindow *parent = GetParent();