X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcc4aa97ff6f7efc97ddb3683f244cbb97e7ea80..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index b83a78ae32..8b27babb06 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -154,20 +154,17 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 
     if ( !m_hWnd )
     {
-        wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
-        wxFAIL_MSG(_T("something is very wrong, CreateWindowEx failed"));
+#ifdef __WXDEBUG__
+        wxFAIL_MSG(wxString::Format
+                   (
+                    _T("CreateWindowEx(\"%s\", flags=%08x, ex=%08x) failed"),
+                    classname, (unsigned int)style, (unsigned int)exstyle
+                   ));
+#endif // __WXDEBUG__
 
         return false;
     }
 
-#if wxUSE_CTL3D
-    if ( want3D )
-    {
-        Ctl3dSubclassCtl(GetHwnd());
-        m_useCtl3D = true;
-    }
-#endif // wxUSE_CTL3D
-
     // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
@@ -191,7 +188,11 @@ wxBorder wxControl::GetDefaultBorder() const
     // we want to automatically give controls a sunken style (confusingly,
     // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
     // which is not sunken at all under Windows XP -- rather, just the default)
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    return wxBORDER_SIMPLE;
+#else
     return wxBORDER_SUNKEN;
+#endif
 }
 
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
@@ -215,15 +216,15 @@ wxSize wxControl::DoGetBestSize() const
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
 // wxChoice and others.
-wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
+wxSize wxControl::GetBestSpinnerSize(const bool is_vertical) const
 {
     // take size according to layout
     wxSize bestSize(
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
                     0,GetCharHeight()
 #else
-                    GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
-                    GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
+                    ::GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
+                    ::GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
 #endif
     );
 
@@ -331,7 +332,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
 }
 #endif // Win95
 
-WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
+WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
 {
     HDC hdc = (HDC)pDC;
     if ( m_hasFgCol )
@@ -339,8 +340,19 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
         ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
     }
 
+    WXHBRUSH hbr = 0;
+    if ( !colBg.Ok() )
+    {
+        hbr = MSWGetBgBrush(pDC, hWnd);
+
+        // if the control doesn't have any bg colour, foreground colour will be
+        // ignored as the return value would be 0 -- so forcefully give it a
+        // non default background brush in this case
+        if ( !hbr && m_hasFgCol )
+            colBg = GetBackgroundColour();
+    }
+
     // use the background colour override if a valid colour is given
-    WXHBRUSH hbr;
     if ( colBg.Ok() )
     {
         ::SetBkColor(hdc, wxColourToRGB(colBg));
@@ -349,29 +361,35 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
 
         hbr = (WXHBRUSH)brush->GetResourceHandle();
-    }
-    else // use our own background colour and recurse upwards if necessary
-    {
-        hbr = MSWGetBgBrush(pDC);
+
+        // if we use custom background, we should set foreground ourselves too
+        if ( !m_hasFgCol )
+        {
+            ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+        }
+        //else: already set above
     }
 
     return hbr;
 }
 
-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)
 {
-    // by default consider that the controls text shouldn't erase the
-    // background under it (this is true for all static controls, check boxes,
-    // radio buttons, ...
-    ::SetBkMode((HDC)pDC, TRANSPARENT);
+    wxColour colBg;
+
+    if ( HasTransparentBackground() )
+        ::SetBkMode((HDC)pDC, TRANSPARENT);
+    else // if the control is opaque it shouldn't use the parents background
+        colBg = GetBackgroundColour();
 
-    return DoMSWControlColor(pDC, wxNullColour);
+    return DoMSWControlColor(pDC, colBg, hWnd);
 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
 {
     return DoMSWControlColor(pDC,
-                             wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+                             wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+                             GetHWND());
 }
 
 // ---------------------------------------------------------------------------