compilation fix for wxUSE_ON_FATAL_EXCEPTION == 0

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d5775be8b75ace8967a8bd04c8dd7ada73c19c24..63869411c44db239f29f02948dfe2d0214187cd5 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -154,20 +154,17 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 
     if ( !m_hWnd )
     {
 
     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;
     }
 
 
         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);
 
     // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 


@@ -215,15 +212,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.
 // 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
 {
     // 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
     );
 
 #endif
     );
 


@@ -343,6 +340,8 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
     WXHBRUSH hbr;
     if ( colBg.Ok() )
     {
     WXHBRUSH hbr;
     if ( colBg.Ok() )
     {

+        ::SetBkColor(hdc, wxColourToRGB(colBg));
+

         // draw children with the same colour as the parent
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
 
         // draw children with the same colour as the parent
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
 


@@ -360,7 +359,7 @@ WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
 {
     // by default consider that the controls text shouldn't erase the
     // background under it (this is true for all static controls, check boxes,
 {
     // 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, ...
+    // radio buttons, ...)

     ::SetBkMode((HDC)pDC, TRANSPARENT);
 
     return DoMSWControlColor(pDC, wxNullColour);
     ::SetBkMode((HDC)pDC, TRANSPARENT);
 
     return DoMSWControlColor(pDC, wxNullColour);