added wxEXEC_NODISABLE

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 2dc7d3e0e909325ba0340eff098d54f8908e1f66..1561c9d470c7085718f58635e4ec6975f2b6cff1 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -126,11 +126,15 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         style |= WS_VISIBLE;
     }
 
-    // choose the position for the control
+    // choose the position for the control: we have a problem with default size
+    // here as we can't calculate the best size before the control exists
+    // (DoGetBestSize() may need to use m_hWnd), so just choose the minimal
+    // possible but non 0 size because 0 window width/height result in problems
+    // elsewhere
     int x = pos.x == wxDefaultCoord ? 0 : pos.x,
         y = pos.y == wxDefaultCoord ? 0 : pos.y,
-        w = size.x == wxDefaultCoord ? 0 : size.x,
-        h = size.y == wxDefaultCoord ? 0 : size.y;
+        w = size.x == wxDefaultCoord ? 1 : size.x,
+        h = size.y == wxDefaultCoord ? 1 : size.y;
 
     // ... and adjust it to account for a possible parent frames toolbar
     AdjustForParentClientOrigin(x, y);
@@ -327,49 +331,45 @@ 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 )
+    // use the background colour override if a valid colour is given
+    WXHBRUSH hbr;
+    if ( colBg.Ok() )
     {
-        wxColour colBack = GetBackgroundColour();
-
-        ::SetBkColor(hdc, wxColourToRGB(colBack));
+        // draw children with the same colour as the parent
+        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
 
-        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
-
-        return (WXHBRUSH)brush->GetResourceHandle();
+        hbr = (WXHBRUSH)brush->GetResourceHandle();
     }
-
-    SetBkMode(hdc, TRANSPARENT);
-
-#if wxUSE_UXTHEME && wxUSE_NOTEBOOK
-    if ( wxUxThemeEngine::GetIfActive() )
+    else // use our own background colour and recurse upwards if necessary
     {
-        for ( wxWindow *win = this; win; win = win->GetParent() )
-        {
-            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;
-                }
-            }
-        }
+        hbr = MSWGetBgBrush(pDC);
     }
-#endif // wxUSE_UXTHEME
 
-    return GetStockObject(NULL_BRUSH);
+    return hbr;
+}
+
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+{
+    ::SetBkMode((HDC)pDC, TRANSPARENT);
+
+    return MSWControlColorSolid(pDC);
+}
+
+WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
+{
+    return MSWControlColorSolid
+           (
+                pDC,
+                wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)
+           );
 }
 
 // ---------------------------------------------------------------------------