rewrote and virtualized the background erasing logic: each window may now

specify which background brush should be used for its children and each child
may also choose to use either background brush or (solid) background colour

wxWindow::OnEraseBackground() and wxControl::MSWControlColor() now use the
same code


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

src/msw/control.cpp

@@ -358,44 +358,9 @@ WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
 
     ::SetBkMode((HDC)pDC, TRANSPARENT);
 
-    // check if we should adapt our background to our parent
-    for ( wxWindow *win = this; win; win = win->GetParent() )
-    {
-        if ( win->IsTopLevel() )
-        {
-            // don't go beyond the first top level parent
-            break;
-        }
+    hbr = MSWGetBgBrush(pDC);
 
-        if ( win->GetBackgroundStyle() == wxBG_STYLE_COLOUR )
-        {
-            // parent window has solid colour, so it doesn't look
-            // transparent and hence we shouldn't show notebook background
-            wxBrush *brush = wxTheBrushList->FindOrCreateBrush
-                                             (
-                                                win->GetBackgroundColour(),
-                                                wxSOLID
-                                             );
-
-            return (WXHBRUSH)brush->GetResourceHandle();
-        }
-
-#if wxUSE_UXTHEME && wxUSE_NOTEBOOK
-        // check for the special case of the notebooks which draw themed
-        // background when themes are enabled
-        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 && wxUSE_NOTEBOOK
-    }
-
-    // let the control deal with background itself
-    return MSWGetDefaultBgBrush();
+    return hbr ? hbr : MSWGetDefaultBgBrush();
 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)