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

Fix use of GDK_TOUCHPAD_GESTURE_MASK with GTK+ 3.14..3.16

Browse Source 
Define GDK_TOUCHPAD_GESTURE_MASK ourselves if GTK+ headers don't define
it and don't use it during run-time if GTK+ version is less than 3.18,
in which it was added.
This commit is contained in:
Vadim Zeitlin
2017-12-02 21:29:09 +01:00
parent 3e0adbf541
commit 289fbcf5be
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/window.cpp
View File

@@ -3506,7 +3506,15 @@ void wxWindowGesturesData::Reinit(wxWindowGTK* win,
wxASSERT_MSG( eventsMask == 0, "Unknown touch event mask bit specified" ); wxASSERT_MSG( eventsMask == 0, "Unknown touch event mask bit specified" );
gtk_widget_add_events(widget, GDK_TOUCHPAD_GESTURE_MASK); // GDK_TOUCHPAD_GESTURE_MASK was added in 3.18, but we can just define it
// ourselves if we use an earlier version when compiling.
#if !GTK_CHECK_VERSION(3,18,0)
#define GDK_TOUCHPAD_GESTURE_MASK (1 << 24)
#endif
if ( gtk_check_version(3, 18, 0) == NULL )
{
gtk_widget_add_events(widget, GDK_TOUCHPAD_GESTURE_MASK);
}
g_signal_connect (widget, "touch-event", g_signal_connect (widget, "touch-event",
G_CALLBACK(touch_callback), win); G_CALLBACK(touch_callback), win);