]> git.saurik.com Git - wxWidgets.git/commitdiff
propagate scroll wheel events to parent, fixes #15187
authorStefan Csomor <csomor@advancedconcepts.ch>
Sun, 2 Jun 2013 09:33:33 +0000 (09:33 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Sun, 2 Jun 2013 09:33:33 +0000 (09:33 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/cocoa/window.mm

index 9bda9421f09769db33b39e066a7f9b80bc5665b9..a9efa584854166d3ca87c8347ec233ba4d1aa0c1 100644 (file)
@@ -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);