Removed redundant Init call (bug 1724495)

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index f0d866b275270dfe0117375824a0399d5ac20531..d4ae78000acbcb3eeae043bcf98db54132aac22f 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -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;
@@ -246,8 +246,6 @@ wxSize wxControl::DoGetBestSize() const
 wxBorder wxControl::GetDefaultBorder() const
 {
     return wxControlBase::GetDefaultBorder();
-
-//  return GetDefaultBorderForControl();
 }
 
 // This is a helper for all wxControls made with UPDOWN native control.
@@ -317,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,
@@ -365,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)