X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48fa6bd38ac743f4067e74d4168168ae3a4a068e..5c836c463a8ece980b66ebc9920f1b045d9a8f33:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 2dc7d3e0e9..30bc08f498 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -327,24 +327,32 @@ bool wxControl::MSWOnNotify(int idCtrl,
 }
 #endif // Win95
 
-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColorSolid(WXHDC pDC, wxColour colBg)
 {
     HDC hdc = (HDC)pDC;
     if ( m_hasFgCol )
         ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
 
-    if ( m_hasBgCol )
+    if ( colBg.Ok() )
     {
-        wxColour colBack = GetBackgroundColour();
-
-        ::SetBkColor(hdc, wxColourToRGB(colBack));
+        ::SetBkColor(hdc, wxColourToRGB(colBg));
 
-        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
 
         return (WXHBRUSH)brush->GetResourceHandle();
     }
 
-    SetBkMode(hdc, TRANSPARENT);
+    return 0;
+}
+
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+{
+    WXHBRUSH hbr = MSWControlColorSolid(pDC, m_hasBgCol ? m_backgroundColour
+                                                        : wxNullColour);
+    if ( hbr )
+        return hbr;
+
+    ::SetBkMode((HDC)pDC, TRANSPARENT);
 
 #if wxUSE_UXTHEME && wxUSE_NOTEBOOK
     if ( wxUxThemeEngine::GetIfActive() )
@@ -354,22 +362,25 @@ WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
             wxNotebook *nbook = wxDynamicCast(win, wxNotebook);
             if ( nbook )
             {
-                WXHBRUSH hbr = nbook->GetThemeBackgroundBrush();
-                if ( hbr )
-                {
-                    RECT rc;
-                    GetWindowRect(GetHwnd(), &rc);
-
-                    MapWindowPoints(NULL, GetHwndOf(nbook), (POINT *)&rc, 1);
-                    SetBrushOrgEx(hdc, -rc.left, -rc.top, NULL);
-                    return hbr;
-                }
+                // 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
 
-    return GetStockObject(NULL_BRUSH);
+    return ::GetStockObject(NULL_BRUSH);
+}
+
+WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
+{
+    return MSWControlColorSolid
+           (
+                pDC,
+                wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)
+           );
 }
 
 // ---------------------------------------------------------------------------