X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b782f2e0f6abc7baa9a8bfc158847a89d5d12145..9b00bb1626a28272e58728633f431c0c2996cd2d:/src/msw/spinbutt.cpp

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index c3f1af3b27..6cc04c468f 100644
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -35,6 +35,8 @@
 // Can't resolve reference to CreateUpDownControl in
 // TWIN32, but could probably use normal CreateWindow instead.
 
+#if wxUSE_SPINBTN
+
 #if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include "wx/spinbutt.h"
@@ -151,7 +153,7 @@ wxSpinButton::~wxSpinButton()
 // size calculation
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinButton::DoGetBestSize()
+wxSize wxSpinButton::DoGetBestSize() const
 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {
@@ -209,9 +211,9 @@ bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam,
 bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 #ifndef __GNUWIN32__
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(__WATCOMC__)
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
-#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
+#elif defined(__VISUALC__) && (__VISUALC__ >= 1000) && (__VISUALC__ < 1020)
     LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam;
 #else
     LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
@@ -240,3 +242,7 @@ bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
 }
 
 #endif // __WIN95__
+
+#endif
+    // wxUSE_SPINCTN
+