From ffafd8a55bb0b8fb4236e4522792a6b143813609 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Thu, 11 Dec 2003 22:20:22 +0000
Subject: [PATCH] Fixed notebook redraw problems when using XP theme with
 Classic appearance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/notebook.h |  6 ++++--
 src/msw/notebook.cpp      | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 86f6458956..b7ad535337 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -175,8 +175,10 @@ protected:
   // set the size of the given page to fit in the notebook
   void AdjustPageSize(wxNotebookPage *page);
 
-  // override WndProc
-  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    // override WndProc.
+#if wxUSE_UXTHEME
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif
 
   // the current selection (-1 if none)
   int m_nSelection;
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 7f4a3e3f17..da0ea9377d 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -974,10 +974,11 @@ void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&)
 #endif
 }
 
+#if wxUSE_UXTHEME
 long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
     static bool g_TestedForTheme = false;
-    static bool g_UseTheme = false;
+    static bool g_supportsThemes = false;
     switch ( nMsg )
     {
         case WM_ERASEBKGND:
@@ -986,19 +987,25 @@ long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             {
                 int commCtrlVersion = wxTheApp->GetComCtl32Version() ;
 
-                g_UseTheme = (commCtrlVersion >= 600);
+                g_supportsThemes = (commCtrlVersion >= 600);
                 g_TestedForTheme = true;
             }
 
-            // If using XP themes, it seems we can get away
+            // If currently an XP theme is active, it seems we can get away
             // with not drawing a background, which reduces flicker.
-            if (g_UseTheme)            
-                return true;
+            if (g_supportsThemes)
+            {
+                wxUxThemeEngine *p = wxUxThemeEngine::Get();
+                if (p && p->IsThemeActive() )
+                {
+                    return true;
+                }
+            }
         }
     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
-
+#endif // #if wxUSE_UXTHEME
 
 #endif // wxUSE_NOTEBOOK
-- 
2.47.2