When drawing a solid page background, don't use theme painting

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index e73853067695a35904562411e68d26c33f9ae508..5510e52fb7bc90fed2a66c78175b0d4c82838fe8 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -94,9 +94,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)

-

     EVT_SIZE(wxNotebook::OnSize)
     EVT_SIZE(wxNotebook::OnSize)

-

     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 


@@ -1007,6 +1005,12 @@ wxNotebook::MSWPrintChild(wxWindow *win,
                           WXWPARAM wParam,
                           WXLPARAM WXUNUSED(lParam))
 {
                           WXWPARAM wParam,
                           WXLPARAM WXUNUSED(lParam))
 {

+    // Don't paint the theme for the child if we have a solid
+    // background
+    if (m_hasBgCol || HasFlag(wxNB_NOPAGETHEME) || (wxSystemOptions::HasOption(wxT("msw.notebook.themed-background")) &&
+                                      wxSystemOptions::GetOptionInt(wxT("msw.notebook.themed-background")) == 0))
+        return false;
+    

     RECT rc;
     ::GetClientRect(GetHwnd(), &rc);
     TabCtrl_AdjustRect(GetHwnd(), true, &rc);
     RECT rc;
     ::GetClientRect(GetHwnd(), &rc);
     TabCtrl_AdjustRect(GetHwnd(), true, &rc);