]> git.saurik.com Git - wxWidgets.git/commitdiff
Disable handling of wxEVT_MOUSEWHEEL in wxVarScrollHelperEvtHandler in wxGTK.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 15 Sep 2013 00:15:26 +0000 (00:15 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 15 Sep 2013 00:15:26 +0000 (00:15 +0000)
Just for consistency with wxScrollHelperBase, not really sure what problem
exactly does this solve.

See #15357.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/generic/vscroll.cpp

index c6e714afbedd3bb332387035e0abcbdc275cf437..efbef67e3344e8953c598ea2e733dbdd28e4c1a4 100644 (file)
@@ -137,10 +137,13 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
         }
     }
 #if wxUSE_MOUSEWHEEL
+    // Use GTK's own scroll wheel handling in GtkScrolledWindow
+#ifndef __WXGTK20__
     else if ( evType == wxEVT_MOUSEWHEEL )
     {
         m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
     }
+#endif
 #endif // wxUSE_MOUSEWHEEL
     else if ( evType == wxEVT_CHAR &&
                 (m_scrollHelper->GetOrientation() == wxVERTICAL) )