From 5b0c463561f25eba690cea7026a06319be8fd00b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 11 Jul 2013 19:31:21 +0000 Subject: [PATCH] adapt to wx conventions for scroll wheel differences between horizontal and vertical directions, fixes #15269 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/window.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 3465cdbc40..a12de97681 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -687,8 +687,11 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve if ( fabs(deltaX) > fabs(deltaY) ) { + // wx conventions for horizontal are inverted from vertical (originating from native msw behavior) + // right and up are positive values, left and down are negative values, while on OSX right and down + // are negative and left and up are positive. wxevent.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; - wxevent.m_wheelRotation = (int)deltaX; + wxevent.m_wheelRotation = -(int)deltaX; } else { -- 2.47.2