Compile fixes,

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 97138c24268196048a6563a232a6fa14357e56c0..e3c8964586a15d80570915d89d53a7b90f69d611 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -32,7 +32,7 @@
 #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
 
@@ -115,7 +115,7 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetValue() const
 {
-    return LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));
+    return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));
 }
 
 void wxSpinButton::SetValue(int val)
@@ -133,50 +133,44 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
                                WXWORD pos, WXHWND control)
 {
-    if ( !control )
-        return FALSE;
-
-    wxSpinEvent event(wxEVT_NULL, m_windowId);
-    event.SetPosition(pos);
-    event.SetOrientation(orientation);
-    event.SetEventObject(this);
+    wxCHECK_MSG( control, FALSE, _T("scrolling what?") )
 
-    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;
+#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)