X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae090fdb7f4be47466b5728ad37065923b48c8c3..29149a64916d6fdc53e445adca9ef83bc58fb6c3:/src/msw/slider95.cpp?ds=inline diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 443bfec956..640e15e407 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -20,8 +20,9 @@ #pragma hdrstop #endif +#if wxUSE_SLIDER + #ifndef WX_PRECOMP -#include #include "wx/utils.h" #include "wx/brush.h" #endif @@ -203,60 +204,41 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id, bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, WXWORD 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 +633,4 @@ bool wxSlider95::Show(bool show) #endif // __WIN95__ +#endif // wxUSE_SLIDER