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

Make tests for gestures in wxGTK code more clear

Browse Source 
Use wxGTK_HAS_GESTURES_SUPPORT to guard gesture-related code instead of
checking for the 3.14 GTK+ version explicitly in several places.

No real changes.
This commit is contained in:
Vadim Zeitlin
2017-10-12 00:00:54 +02:00
parent 261b04b5a3
commit 06d936f3f7
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/window.cpp
View File

@@ -229,6 +229,11 @@ static bool gs_inSizeAllocate;
#endif #endif
#if GTK_CHECK_VERSION(3,14,0) #if GTK_CHECK_VERSION(3,14,0)
#define wxGTK_HAS_GESTURES_SUPPORT
#endif
#ifdef wxGTK_HAS_GESTURES_SUPPORT
// This is true when the gesture has just started (currently used for pan gesture only) // This is true when the gesture has just started (currently used for pan gesture only)
static bool gs_gestureStart = false; static bool gs_gestureStart = false;
@@ -243,7 +248,8 @@ static gdouble gs_lastAngle = 0;
// Last Zoom/Rotate gesture point // Last Zoom/Rotate gesture point
static wxPoint gs_lastGesturePoint; static wxPoint gs_lastGesturePoint;
#endif // GTK_CHECK_VERSION(3,14,0)
#endif // wxGTK_HAS_GESTURES_SUPPORT
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// debug // debug
@@ -2448,12 +2454,12 @@ void wxWindowGTK::Init()
m_dirtyTabOrder = false; m_dirtyTabOrder = false;
#if GTK_CHECK_VERSION(3,14,0) #ifdef wxGTK_HAS_GESTURES_SUPPORT
m_touchCount = 0; m_touchCount = 0;
m_lastTouchTime = 0; m_lastTouchTime = 0;
m_allowedGestures = 0; m_allowedGestures = 0;
m_activeGestures = 0; m_activeGestures = 0;
#endif // GTK_CHECK_VERSION(3,14,0) #endif // wxGTK_HAS_GESTURES_SUPPORT
} }
wxWindowGTK::wxWindowGTK() wxWindowGTK::wxWindowGTK()
@@ -2852,7 +2858,8 @@ static gboolean source_dispatch(GSource*, GSourceFunc, void*)
} }
} }
#if GTK_CHECK_VERSION(3,14,0) #ifdef wxGTK_HAS_GESTURES_SUPPORT
// Currently used for Press and Tap gesture only // Currently used for Press and Tap gesture only
enum GestureStates enum GestureStates
{ {
@@ -3299,7 +3306,8 @@ touch_callback(GtkWidget* WXUNUSED(widget), GdkEventTouch* gdk_event, wxWindowGT
break; break;
} }
} }
#endif // GTK_CHECK_VERSION(3,14,0)
#endif // wxGTK_HAS_GESTURES_SUPPORT
void wxWindowGTK::ConnectWidget( GtkWidget *widget ) void wxWindowGTK::ConnectWidget( GtkWidget *widget )
{ {
@@ -3344,7 +3352,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
g_signal_connect (widget, "leave_notify_event", g_signal_connect (widget, "leave_notify_event",
G_CALLBACK (gtk_window_leave_callback), this); G_CALLBACK (gtk_window_leave_callback), this);
#if GTK_CHECK_VERSION(3,14,0) #ifdef wxGTK_HAS_GESTURES_SUPPORT
if ( gtk_check_version(3, 14, 0) == NULL ) if ( gtk_check_version(3, 14, 0) == NULL )
{ {
GtkGesture* vertical_pan_gesture = gtk_gesture_pan_new(widget, GTK_ORIENTATION_VERTICAL); GtkGesture* vertical_pan_gesture = gtk_gesture_pan_new(widget, GTK_ORIENTATION_VERTICAL);
@@ -3417,7 +3425,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
g_signal_connect (widget, "touch-event", g_signal_connect (widget, "touch-event",
G_CALLBACK(touch_callback), this); G_CALLBACK(touch_callback), this);
} }
#endif // GTK_CHECK_VERSION(3,14,0) #endif // wxGTK_HAS_GESTURES_SUPPORT
} }
void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height) void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)