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

Commited wheel mouse event patch for GTK.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-10-13 11:13:19 +00:00
parent 86181cbde1
commit 366f5f1fd0
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/window.cpp
View File

@@ -1304,6 +1304,13 @@ static gint gtk_window_key_release_callback( GtkWidget *widget,
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); \
if (event.GetEventType()==wxEVT_MOUSEWHEEL) \
{ \
if (((GdkEventButton*)gdk_event)->button == 4) \
event.m_wheelRotation = 120; \
else if (((GdkEventButton*)gdk_event)->button == 5) \
event.m_wheelRotation = -120; \
} \
\ \
wxPoint pt = win->GetClientAreaOrigin(); \ wxPoint pt = win->GetClientAreaOrigin(); \
event.m_x = (wxCoord)gdk_event->x - pt.x; \ event.m_x = (wxCoord)gdk_event->x - pt.x; \
@@ -1497,7 +1504,22 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
default: break; default: break;
} }
} }
else if (gdk_event->button == 4)
{
switch (gdk_event->type)
{
case GDK_BUTTON_PRESS: event_type = wxEVT_MOUSEWHEEL; break;
default: break;
}
}
else if (gdk_event->button == 5)
{
switch (gdk_event->type)
{
case GDK_BUTTON_PRESS: event_type = wxEVT_MOUSEWHEEL; break;
default: break;
}
}
if ( event_type == wxEVT_NULL ) if ( event_type == wxEVT_NULL )
{ {

24
src/gtk1/window.cpp
View File

@@ -1304,6 +1304,13 @@ static gint gtk_window_key_release_callback( GtkWidget *widget,
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); \
if (event.GetEventType()==wxEVT_MOUSEWHEEL) \
{ \
if (((GdkEventButton*)gdk_event)->button == 4) \
event.m_wheelRotation = 120; \
else if (((GdkEventButton*)gdk_event)->button == 5) \
event.m_wheelRotation = -120; \
} \
\ \
wxPoint pt = win->GetClientAreaOrigin(); \ wxPoint pt = win->GetClientAreaOrigin(); \
event.m_x = (wxCoord)gdk_event->x - pt.x; \ event.m_x = (wxCoord)gdk_event->x - pt.x; \
@@ -1497,7 +1504,22 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
default: break; default: break;
} }
} }
else if (gdk_event->button == 4)
{
switch (gdk_event->type)
{
case GDK_BUTTON_PRESS: event_type = wxEVT_MOUSEWHEEL; break;
default: break;
}
}
else if (gdk_event->button == 5)
{
switch (gdk_event->type)
{
case GDK_BUTTON_PRESS: event_type = wxEVT_MOUSEWHEEL; break;
default: break;
}
}
if ( event_type == wxEVT_NULL ) if ( event_type == wxEVT_NULL )
{ {