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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 297d81e8fb..d027e9d5e5 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -21,13 +21,16 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include "wx/event.h"
 #include "wx/app.h"
 #include "wx/dcclient.h"
 #endif
 
+#include "wx/control.h"
+
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
 #include <commctrl.h>
 #endif
 
@@ -61,7 +64,7 @@ wxControl::~wxControl(void)
   wxWindow *parent = (wxWindow *)GetParent();
   if (parent)
   {
-    if (parent->GetDefaultItem() == this)
+    if (parent->GetDefaultItem() == (wxButton*) this)
         parent->SetDefaultItem(NULL);
   }
 }
@@ -180,13 +183,8 @@ void wxControl::MSWOnMouseMove(int x, int y, WXUINT flags)
     Default();
 }
 
-long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
-}
-
 bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
-                          WXLPARAM* WXUNUSED(result))
+                          WXLPARAM* result)
 {
 #if defined(__WIN95__)
 	wxCommandEvent event(wxEVT_NULL, m_windowId);
@@ -237,7 +235,7 @@ bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
 		}
 */
 		default:
-			return FALSE;
+            return wxWindow::MSWNotify(wParam, lParam, result);
 	}
 
     event.SetEventType(eventType);