X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/028003016290b62becb31873c38a202d6e61eec4..b80ec6db893bc3663dd6d6802ccb8c2d85c1ef97:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 8d4f4b718d..bcbd6f38ff 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
 
@@ -50,6 +53,7 @@ wxControl::wxControl(void)
   m_backgroundColour = *wxWHITE;
   m_foregroundColour = *wxBLACK;
   m_callback = 0;
+//  m_windowCursor = wxNullCursor; // To avoid the standard cursor being used
 }
 
 wxControl::~wxControl(void)
@@ -61,7 +65,7 @@ wxControl::~wxControl(void)
   wxWindow *parent = (wxWindow *)GetParent();
   if (parent)
   {
-    if (parent->GetDefaultItem() == this)
+    if (parent->GetDefaultItem() == (wxButton*) this)
         parent->SetDefaultItem(NULL);
   }
 }
@@ -180,12 +184,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)
+bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
+                          WXLPARAM* result)
 {
 #if defined(__WIN95__)
 	wxCommandEvent event(wxEVT_NULL, m_windowId);
@@ -235,18 +235,18 @@ bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 			break;
 		}
 */
-		default :
-			return FALSE;
-			break;
+		default:
+            return wxWindow::MSWNotify(wParam, lParam, result);
 	}
+
     event.SetEventType(eventType);
 	event.SetEventObject(this);
 
 	if ( !GetEventHandler()->ProcessEvent(event) )
 		return FALSE;
 	return TRUE;
-#else
-  return FALSE;
+#else   // !Win95
+    return FALSE;
 #endif
 }