From 777e7c8a8df62b515b525d02dd8867834935b648 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 3 Nov 2009 14:10:40 +0000 Subject: [PATCH] Generate wxEVT_MOUSEWHEEL events for Shift-wheel in wxMac. Handle both kEventMouseWheelAxisY and kEventMouseWheelAxisX events (the latter is generated when Shift is pressed). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/toplevel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 1c0e5a62a9..8c8276a181 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -367,7 +367,8 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) EventMouseWheelAxis axis = cEvent.GetParameter(kEventParamMouseWheelAxis, typeMouseWheelAxis) ; SInt32 delta = cEvent.GetParameter(kEventParamMouseWheelDelta, typeSInt32) ; - if ( axis == kEventMouseWheelAxisY ) + if ( axis == kEventMouseWheelAxisX || + axis == kEventMouseWheelAxisY ) { wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; wxevent.m_wheelRotation = delta;