X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a23fd0e1d1329a4a258b4defb3e0b0001b700c6e..1949cd9c5c938b37559f25ff563a814c111bb5ff:/src/msw/spinbutt.cpp

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index e1efced86e..607c4f5826 100644
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -32,22 +32,21 @@
 #include "wx/spinbutt.h"
 #include "wx/msw/private.h"
 
-#if !defined(__GNUWIN32__) || defined(__TWIN32__)
+#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
     #include <commctrl.h>
 #endif
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
 #endif
 
-wxSpinButton::wxSpinButton()
-{
-    m_min = 0;
-    m_max = 100;
-}
-
-bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            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->GetBackgroundColour() ;
@@ -73,13 +72,12 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
   if (y < 0)
     y = 0;
 
-  m_min = 0;
-  m_max = 100;
+  InitBase();
 
   m_windowId = (id == -1) ? NewControlId() : id;
 
   DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
-  
+
   if ( m_windowStyle & wxSP_HORIZONTAL )
     wstyle |= UDS_HORZ;
   if ( m_windowStyle & wxSP_ARROW_KEYS )
@@ -102,7 +100,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
   // TODO: have this for all controls.
   if ( !m_hWnd )
     return FALSE;
-  
+
   SubclassWin((WXHWND) m_hWnd);
 
   return TRUE;
@@ -117,69 +115,64 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetValue() const
 {
-    return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0);
+    return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));
 }
 
 void wxSpinButton::SetValue(int val)
 {
-    ::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0));
+    ::SendMessage(GetHwnd(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0));
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
-    m_min = minVal;
-    m_max = maxVal;
-    ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0,
+    wxSpinButtonBase::SetRange(minVal, maxVal);
+    ::SendMessage(GetHwnd(), UDM_SETRANGE, 0,
                    (LPARAM) MAKELONG((short)maxVal, (short)minVal));
 }
 
 bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
                                WXWORD pos, WXHWND control)
 {
-    if ( !control )
-        return FALSE;
+    wxCHECK_MSG( control, FALSE, _T("scrolling what?") )
 
-    wxSpinEvent event(wxEVT_NULL, m_windowId);
-    event.SetPosition(pos);
-    event.SetOrientation(orientation);
-    event.SetEventObject(this);
-
-    switch ( wParam )
+    if ( wParam != SB_THUMBPOSITION )
     {
-        case SB_TOP:
-            event.m_eventType = wxEVT_SCROLL_TOP;
-            break;
-
-        case SB_BOTTOM:
-            event.m_eventType = wxEVT_SCROLL_BOTTOM;
-            break;
+        // probable SB_ENDSCROLL - we don't react to it
+        return FALSE;
+    }
 
-        case SB_LINEUP:
-            event.m_eventType = wxEVT_SCROLL_LINEUP;
-            break;
+    wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
+    event.SetPosition((short)pos);    // cast is important for negative values!
+    event.SetEventObject(this);
 
-        case SB_LINEDOWN:
-            event.m_eventType = wxEVT_SCROLL_LINEDOWN;
-            break;
+    return GetEventHandler()->ProcessEvent(event);
+}
 
-        case SB_PAGEUP:
-            event.m_eventType = wxEVT_SCROLL_PAGEUP;
-            break;
+bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
+{
+#ifndef __GNUWIN32__
+#ifdef __BORLANDC__
+    LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
+#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
+    LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
+#else
+    LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
+#endif
 
-        case SB_PAGEDOWN:
-            event.m_eventType = wxEVT_SCROLL_PAGEDOWN;
-            break;
+    wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP
+                                         : wxEVT_SCROLL_LINEDOWN,
+                      m_windowId);
+    event.SetPosition(lpnmud->iPos + lpnmud->iDelta);
+    event.SetEventObject(this);
 
-        case SB_THUMBTRACK:
-        case SB_THUMBPOSITION:
-            event.m_eventType = wxEVT_SCROLL_THUMBTRACK;
-            break;
+    bool processed = GetEventHandler()->ProcessEvent(event);
 
-        default:
-            return FALSE;
-    }
+    *result = event.IsAllowed() ? 0 : 1;
 
-    return GetEventHandler()->ProcessEvent(event);
+    return processed;
+#else
+    return FALSE;
+#endif
 }
 
 bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
@@ -188,12 +181,4 @@ bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
     return FALSE;
 }
 
-// Spin event
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id)
-           : wxScrollEvent(commandType, id)
-{
-}
-
 #endif // __WIN95__