Setting the background colour of a wxWindow or

    wxScrolledWindow etc. should only affect the
    actual background, not the border (sunken)
    or the scrollbars etc.

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index fd76da760fcf3b421a7ccf71c394f73879c6c801..9bd0dc994e64d10c7966deb8ec8f3cb708d07244 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4370,7 +4370,8 @@ void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     if (m_wxwindow)
         gtk_widget_modify_style(m_wxwindow, style);
 {
     if (m_wxwindow)
         gtk_widget_modify_style(m_wxwindow, style);

-    gtk_widget_modify_style(m_widget, style);
+    else
+        gtk_widget_modify_style(m_widget, style);

 }
 
 bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
 }
 
 bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index fd76da760fcf3b421a7ccf71c394f73879c6c801..9bd0dc994e64d10c7966deb8ec8f3cb708d07244 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4370,7 +4370,8 @@ void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     if (m_wxwindow)
         gtk_widget_modify_style(m_wxwindow, style);
 {
     if (m_wxwindow)
         gtk_widget_modify_style(m_wxwindow, style);

-    gtk_widget_modify_style(m_widget, style);
+    else
+        gtk_widget_modify_style(m_widget, style);

 }
 
 bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
 }
 
 bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)