X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd12ce22d806e6a9c40cf7bdfddbb237cd55b0ca..209afcf78cf37ad7cc31c3219b0a57eddc4250ec:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d5775be8b7..a99586da5c 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, style, 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);
 
@@ -222,8 +219,8 @@ wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
 #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
     );
 
@@ -343,6 +340,8 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
     WXHBRUSH hbr;
     if ( colBg.Ok() )
     {
+        ::SetBkColor(hdc, wxColourToRGB(colBg));
+
         // draw children with the same colour as the parent
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);