From 39c0d6d6b6682b1847881d1e2662a4ccdec83ec8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 Sep 2013 00:15:26 +0000 Subject: [PATCH] Disable handling of wxEVT_MOUSEWHEEL in wxVarScrollHelperEvtHandler in wxGTK. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp index c6e714a..efbef67 100644 --- a/src/generic/vscroll.cpp +++ b/src/generic/vscroll.cpp @@ -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) ) -- 2.7.4