X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52682336e8b619044682102d16f22a058f5b2a59..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/src/generic/scrlwing.cpp diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index ea6ffab276..ed7d288d7e 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -5,7 +5,6 @@ // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement. // Ron Lee on 10.4.02: virtual size / auto scrollbars et al. // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -164,9 +163,9 @@ void wxAutoScrollTimer::Notify() wxMouseState mouseState = wxGetMouseState(); - event2.m_leftDown = mouseState.LeftDown(); - event2.m_middleDown = mouseState.MiddleDown(); - event2.m_rightDown = mouseState.RightDown(); + event2.m_leftDown = mouseState.LeftIsDown(); + event2.m_middleDown = mouseState.MiddleIsDown(); + event2.m_rightDown = mouseState.RightIsDown(); event2.m_shiftDown = mouseState.ShiftDown(); event2.m_controlDown = mouseState.ControlDown(); @@ -1018,6 +1017,9 @@ void wxScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event) newEvent.SetOrientation( event.GetWheelAxis() == 0 ? wxVERTICAL : wxHORIZONTAL); newEvent.SetEventObject(m_win); + if ( event.GetWheelAxis() == wxMOUSE_WHEEL_HORIZONTAL ) + lines = -lines; + if (event.IsPageScroll()) { if (lines > 0)