X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fe985eede7d363ec64ac89549eb6e25d023ebcd..41eb6d76b01ccbf41c34ecbfeeabb14a4ac2046f:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index fa80b56493..fe571c7536 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -358,31 +358,9 @@ WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
 
     ::SetBkMode((HDC)pDC, TRANSPARENT);
 
-#if wxUSE_UXTHEME && wxUSE_NOTEBOOK
-    if ( wxUxThemeEngine::GetIfActive() )
-    {
-        for ( wxWindow *win = this; win; win = win->GetParent() )
-        {
-            if ( win->IsTopLevel() )
-            {
-                // don't go beyond the first top level parent
-                break;
-            }
-
-            wxNotebook *nbook = wxDynamicCast(win, wxNotebook);
-            if ( nbook )
-            {
-                // return value may be NULL but it is ok: if the first parent
-                // notebook doesn't use themes, then we don't have to process
-                // this message at all, so let default processing take place
-                return nbook->GetThemeBackgroundBrush(pDC, this);
-            }
-        }
-    }
-#endif // wxUSE_UXTHEME
+    hbr = MSWGetBgBrush(pDC);
 
-    // let the control deal with background itself
-    return 0;
+    return hbr ? hbr : MSWGetDefaultBgBrush();
 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)