Adding MSVC makefile support for building the TIFF library

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index c3f1af3b27ac02c5f7a9ce43611ae05360036850..deafa898b21535fcea7cbe040a8a518364843cf5 100644 (file)
--- 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"
@@ -52,10 +54,8 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
-#endif
 
 // ----------------------------------------------------------------------------
 // wxSpinButton
@@ -151,7 +151,7 @@ wxSpinButton::~wxSpinButton()
 // size calculation
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinButton::DoGetBestSize()
+wxSize wxSpinButton::DoGetBestSize() const
 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {
@@ -209,9 +209,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 +240,7 @@ bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id)
 }
 
 #endif // __WIN95__
+
+#endif
+    // wxUSE_SPINCTN
+