From b0cb91859855885450db5b39dec26ce967e5caf6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 2 Jun 2013 09:33:33 +0000 Subject: [PATCH] propagate scroll wheel events to parent, fixes #15187 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/window.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 9bda942..a9efa58 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -1190,7 +1190,8 @@ void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd) if ( !DoHandleMouseEvent(event) ) { // for plain NSView mouse events would propagate to parents otherwise - if (!IsUserPane()) + // scrollwheel events have to be propagated if not handled in all cases + if (!IsUserPane() || [event type] == NSScrollWheel ) { wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; superimpl(slf, (SEL)_cmd, event); -- 2.7.4