From 45b891b8e15c5a819a604cd929a409d6475a8baf Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 28 Jul 2007 16:55:01 +0000 Subject: [PATCH] Use generic code for wheel scrolling on wxGTK as discussed on wx-dev a couple weeks ago git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/scrlwing.cpp | 3 --- src/gtk/window.cpp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index a8e4abbb44..1afba80a66 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -267,14 +267,11 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event) m_scrollHelper->HandleOnMouseLeave((wxMouseEvent &)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); return true; } -#endif #endif // wxUSE_MOUSEWHEEL else if ( evType == wxEVT_CHAR ) { diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 8ce99d18b2..b94c810fa9 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1776,6 +1776,8 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK); event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK); event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); + + // FIXME: Get these values from GTK or GDK event.m_linesPerAction = 3; event.m_wheelDelta = 120; if (gdk_event->direction == GDK_SCROLL_UP)