tiny fixes

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 86e07a7f8403f94c9014e1d1068dcc5321285512..1b89986f8d2b04a1b77aec3970db934d4e5e816f 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
 
@@ -133,7 +133,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
                                WXWORD pos, WXHWND control)
 {
-    wxCHECK_MSG( control, FALSE, _T("scrolling what?") )
+    wxCHECK_MSG( control, FALSE, T("scrolling what?") )
 
     if ( wParam != SB_THUMBPOSITION )
     {
@@ -151,7 +151,13 @@ bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
 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
 
     wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP
                                          : wxEVT_SCROLL_LINEDOWN,