Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use generic code for wheel scrolling on wxGTK as discussed on wx-dev a couple weeks ago

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-07-28 16:55:01 +00:00
parent 96937739a9
commit 45b891b8e1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/scrlwing.cpp
View File

@@ -267,14 +267,11 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
m_scrollHelper->HandleOnMouseLeave((wxMouseEvent &)event); m_scrollHelper->HandleOnMouseLeave((wxMouseEvent &)event);
} }
#if wxUSE_MOUSEWHEEL #if wxUSE_MOUSEWHEEL
// Use GTK's own scroll wheel handling in GtkScrolledWindow
#ifndef __WXGTK20__
else if ( evType == wxEVT_MOUSEWHEEL ) else if ( evType == wxEVT_MOUSEWHEEL )
{ {
m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event); m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
return true; return true;
} }
#endif
#endif // wxUSE_MOUSEWHEEL #endif // wxUSE_MOUSEWHEEL
else if ( evType == wxEVT_CHAR ) else if ( evType == wxEVT_CHAR )
{ {

2
src/gtk/window.cpp
View File

@@ -1776,6 +1776,8 @@ window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK); event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK);
event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK); event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
// FIXME: Get these values from GTK or GDK
event.m_linesPerAction = 3; event.m_linesPerAction = 3;
event.m_wheelDelta = 120; event.m_wheelDelta = 120;
if (gdk_event->direction == GDK_SCROLL_UP) if (gdk_event->direction == GDK_SCROLL_UP)