Don't draw flat box unless background style is system

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 380f121828b86985452bb3834093dba84e0a518f..6198560342c8b4a5906858d72dd2c96154cc883f 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -632,7 +632,7 @@ static void gtk_window_draw_callback( GtkWidget *widget,
 #ifndef __WXUNIVERSAL__
     GtkPizza *pizza = GTK_PIZZA (widget);
 
 #ifndef __WXUNIVERSAL__
     GtkPizza *pizza = GTK_PIZZA (widget);
 

-    if (win->GetThemeEnabled() && win->GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
+    if (win->GetThemeEnabled() && win->GetBackgroundStyle() == wxBG_STYLE_SYSTEM)

     {
         wxWindow *parent = win->GetParent();
         while (parent && !parent->IsTopLevel())
     {
         wxWindow *parent = win->GetParent();
         while (parent && !parent->IsTopLevel())


@@ -3943,7 +3943,7 @@ void wxWindowGTK::GtkSendPaintEvents()
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
 
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
 

-    if (GetThemeEnabled() && GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
+    if (GetThemeEnabled() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM)

     {
         // find ancestor from which to steal background
         wxWindow *parent = GetParent();
     {
         // find ancestor from which to steal background
         wxWindow *parent = GetParent();

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 380f121828b86985452bb3834093dba84e0a518f..6198560342c8b4a5906858d72dd2c96154cc883f 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -632,7 +632,7 @@ static void gtk_window_draw_callback( GtkWidget *widget,
 #ifndef __WXUNIVERSAL__
     GtkPizza *pizza = GTK_PIZZA (widget);
 
 #ifndef __WXUNIVERSAL__
     GtkPizza *pizza = GTK_PIZZA (widget);
 

-    if (win->GetThemeEnabled() && win->GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
+    if (win->GetThemeEnabled() && win->GetBackgroundStyle() == wxBG_STYLE_SYSTEM)

     {
         wxWindow *parent = win->GetParent();
         while (parent && !parent->IsTopLevel())
     {
         wxWindow *parent = win->GetParent();
         while (parent && !parent->IsTopLevel())


@@ -3943,7 +3943,7 @@ void wxWindowGTK::GtkSendPaintEvents()
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
 
     // widget to draw on
     GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
 

-    if (GetThemeEnabled() && GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
+    if (GetThemeEnabled() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM)

     {
         // find ancestor from which to steal background
         wxWindow *parent = GetParent();
     {
         // find ancestor from which to steal background
         wxWindow *parent = GetParent();