X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a047aff270905b377a81657a90f92eb3297157d0..2edac25b2ea3876bf57a54d314d59050b5fbd8e7:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 2f1ae919e7..24a4e37f2c 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -144,8 +144,8 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                         label.wx_str(),     // the window name
                         style,              // the window style
                         x, y, w, h,         // the window position and size
-                        GetHwndOf(GetParent()),  // parent
-                        (HMENU)GetId(),     // child id
+                        GetHwndOf(GetParent()),         // parent
+                        (HMENU)wxUIntToPtr(GetId()),    // child id
                         wxGetInstance(),    // app instance
                         NULL                // creation parameters
                        );
@@ -153,11 +153,11 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     if ( !m_hWnd )
     {
 #ifdef __WXDEBUG__
-        wxFAIL_MSG(wxString::Format
-                   (
-                    _T("CreateWindowEx(\"%s\", flags=%08x, ex=%08x) failed"),
-                    classname, (unsigned int)style, (unsigned int)exstyle
-                   ));
+        wxLogLastError(wxString::Format
+                       (
+                        _T("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
+                        classname, style, exstyle
+                       ));
 #endif // __WXDEBUG__
 
         return false;
@@ -226,11 +226,6 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 // various accessors
 // ----------------------------------------------------------------------------
 
-wxBorder wxControl::GetDefaultBorder() const
-{
-	return GetDefaultBorderForControl();
-}
-
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
@@ -248,6 +243,11 @@ wxSize wxControl::DoGetBestSize() const
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
+wxBorder wxControl::GetDefaultBorder() const
+{
+    return wxControlBase::GetDefaultBorder();
+}
+
 // This is a helper for all wxControls made with UPDOWN native control.
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
@@ -315,7 +315,7 @@ wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(varian
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 bool wxControl::MSWOnNotify(int idCtrl,
@@ -363,7 +363,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
     event.SetEventType(eventType);
     event.SetEventObject(this);
 
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
@@ -392,10 +392,9 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
         ::SetBkColor(hdc, wxColourToRGB(colBg));
 
         // draw children with the same colour as the parent
-        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
-
+        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg,
+                                                           wxBRUSHSTYLE_SOLID);
         hbr = (WXHBRUSH)brush->GetResourceHandle();
-
     }
 
     // if we use custom background, we should set foreground ourselves too