From 66eb448aa2b38a598afaf6d96643ea7ffb7fb8e9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 25 Sep 2002 17:53:47 +0000 Subject: [PATCH] really fixed handling 32 bit scrollbar positions while dragging the thumb (thanks to Jonathan Marsden) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/scrolbar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp index 16f07a092c..d10d08daad 100644 --- a/src/msw/scrolbar.cpp +++ b/src/msw/scrolbar.cpp @@ -124,7 +124,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, { // current and max positions int position, - maxPos; + maxPos, trackPos = pos; #ifdef __WIN32__ // when we're dragging the scrollbar we can't use pos parameter because it @@ -145,7 +145,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, wxLogLastError(_T("GetScrollInfo")); } - pos = scrollInfo.nTrackPos; + trackPos = scrollInfo.nTrackPos; position = scrollInfo.nPos; maxPos = scrollInfo.nMax; } @@ -201,12 +201,12 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, break; case SB_THUMBPOSITION: - nScrollInc = pos - position; + nScrollInc = trackPos - position; scrollEvent = wxEVT_SCROLL_THUMBRELEASE; break; case SB_THUMBTRACK: - nScrollInc = pos - position; + nScrollInc = trackPos - position; scrollEvent = wxEVT_SCROLL_THUMBTRACK; break;