treectrl -> treetest

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 67d7bc1a5722478571108fb2173145bfec99ca1c..e72bb09b172b3f4338a75a70059c624fe36724cc 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -20,10 +20,12 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SLIDER
+
 #ifndef WX_PRECOMP
-#include <stdio.h>
 #include "wx/utils.h"
 #include "wx/brush.h"
+#include "wx/slider.h"
 #endif
 
 #ifdef __WIN95__
@@ -31,11 +33,11 @@
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 // Slider
 wxSlider95::wxSlider95()
@@ -201,62 +203,43 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
-                             WXWORD pos, WXHWND control)
+                             WXWORD WXUNUSED(pos), WXHWND control)
 {
-    int position = 0; // Dummy - not used in this mode
-
-    int nScrollInc;
-    wxEventType scrollEvent = wxEVT_NULL;
+    wxEventType scrollEvent;
     switch ( wParam )
     {
         case SB_TOP:
-            nScrollInc = m_rangeMax - position;
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
         case SB_BOTTOM:
-            nScrollInc = - position;
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:
-            nScrollInc = - GetLineSize();
             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:
-            nScrollInc = GetLineSize();
             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:
-            nScrollInc = -GetPageSize();
             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:
-            nScrollInc = GetPageSize();
             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBTRACK:
         case SB_THUMBPOSITION:
-#ifdef __WIN32__
-            nScrollInc = (signed short)pos - position;
-#else // Win16
-            nScrollInc = pos - position;
-#endif // Win32/16
             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 
         default:
-            nScrollInc = 0;
-    }
-
-    if (scrollEvent == wxEVT_NULL)
-    {
-        // no event...
-        return FALSE;
+            // unknown scroll event?
+            return FALSE;
     }
 
     int newPos = (int)::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
@@ -651,3 +634,4 @@ bool wxSlider95::Show(bool show)
 #endif
   // __WIN95__
 
+#endif // wxUSE_SLIDER