Fixed three mouse event bugs

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 931add7bc9541ffa7b1dd84572b2e63eb4cf753f..89680b5f5e15a4560f294491b56bd39a96f5a392 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -43,12 +43,12 @@ wxSpinButton::wxSpinButton(void)
        m_max = 100;
 }
 
-bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-            const long style, const wxString& name)
+bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+            long style, const wxString& name)
 {
   wxSystemSettings settings;
-  m_backgroundColour = parent->GetDefaultBackgroundColour() ;
-  m_foregroundColour = parent->GetDefaultForegroundColour() ;
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;
 
   SetName(name);
 
@@ -117,23 +117,23 @@ int wxSpinButton::GetValue(void) const
        return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0);
 }
 
-void wxSpinButton::SetValue(const int val)
+void wxSpinButton::SetValue(int val)
 {
        ::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0));
 }
 
-void wxSpinButton::SetRange(const int minVal, const int maxVal)
+void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;
        ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0, (LPARAM) MAKELONG((short) minVal, (short) maxVal));
 }
 
-void wxSpinButton::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSpinButton::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
 {
   if (control)
   {
-    wxSpinEvent event(0, m_windowId);
+    wxSpinEvent event(wxEVT_NULL, m_windowId);
     event.SetPosition(pos);
     event.SetOrientation(wxVERTICAL);
     event.SetEventObject( this );
@@ -178,11 +178,11 @@ void wxSpinButton::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXH
   }
 }
 
-void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WXHWND control)
+void wxSpinButton::MSWOnHScroll( WXWORD wParam, WXWORD pos, WXHWND control)
 {
   if (control)
   {
-    wxSpinEvent event(0, m_windowId);
+    wxSpinEvent event(wxEVT_NULL, m_windowId);
     event.SetPosition(pos);
     event.SetOrientation(wxHORIZONTAL);
     event.SetEventObject( this );
@@ -227,32 +227,29 @@ void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WX
   }
 }
 
-bool wxSpinButton::MSWCommand(const WXUINT cmd, const WXWORD id)
+bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
 {
   // No command messages
   return FALSE;
 }
 
-bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxSpinButton::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)
 {
        NMHDR* hdr1 = (NMHDR*) lParam;
        switch ( hdr1->code )
        {
-/* We don't process this message, currently */
+        /* We don't process this message, currently */
                case UDN_DELTAPOS:
-               {
-                       return wxControl::MSWNotify(wParam, lParam);
-                       break;
-               }
+
                default :
-                       return wxControl::MSWNotify(wParam, lParam);
+                       return wxControl::MSWNotify(wParam, lParam, result);
                        break;
        }
 /*
        event.eventObject = this;
        event.SetEventType(eventType);
 
-       if ( !ProcessEvent(event) )
+       if ( !GetEventHandler()->ProcessEvent(event) )
                return FALSE;
 */
        return TRUE;
@@ -261,7 +258,7 @@ bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
 // Spin event
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 
-wxSpinEvent::wxSpinEvent(WXTYPE commandType, int id):
+wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
   wxScrollEvent(commandType, id)
 {
 }