diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2014-05-06 18:10:32 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2014-05-23 19:54:29 +0200 |
| commit | 8ab35016a63b9e10dbfd1e268d1610b53da1727b (patch) | |
| tree | 2f79550d797879a4b71c3288abb1cd9fd6800c37 /gtk | |
| parent | 0288fd0a88471b63d707be4d9542ad1aab5f4d2a (diff) | |
| download | gtk+-8ab35016a63b9e10dbfd1e268d1610b53da1727b.tar.gz | |
gesture: make gtk_gesture_cancel_sequence() private
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkgesture.c | 16 | ||||
| -rw-r--r-- | gtk/gtkgesture.h | 6 | ||||
| -rw-r--r-- | gtk/gtkgestureprivate.h | 3 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 3 |
4 files changed, 7 insertions, 21 deletions
diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c index 131d6cabc9..8b99354300 100644 --- a/gtk/gtkgesture.c +++ b/gtk/gtkgesture.c @@ -539,7 +539,7 @@ gtk_gesture_handle_event (GtkEventController *controller, g_signal_emit (gesture, signals[UPDATE], 0, sequence); break; case GDK_TOUCH_CANCEL: - gtk_gesture_cancel_sequence (gesture, sequence); + _gtk_gesture_cancel_sequence (gesture, sequence); break; default: /* Unhandled event */ @@ -1244,19 +1244,9 @@ gtk_gesture_handles_sequence (GtkGesture *gesture, return TRUE; } -/** - * gtk_gesture_cancel_sequence: - * @gesture: a #GtkGesture - * @sequence: a #GdkEventSequence - * - * Cancels @sequence on @gesture, this emits #GtkGesture::cancel - * and forgets the sequence altogether. - * - * Returns: #TRUE if the sequence was being handled by gesture - **/ gboolean -gtk_gesture_cancel_sequence (GtkGesture *gesture, - GdkEventSequence *sequence) +_gtk_gesture_cancel_sequence (GtkGesture *gesture, + GdkEventSequence *sequence) { GtkGesturePrivate *priv; PointData *data; diff --git a/gtk/gtkgesture.h b/gtk/gtkgesture.h index c90b8f1f1a..cac48aae74 100644 --- a/gtk/gtkgesture.h +++ b/gtk/gtkgesture.h @@ -67,9 +67,6 @@ GDK_AVAILABLE_IN_3_14 gboolean gtk_gesture_handles_sequence (GtkGesture *gesture, GdkEventSequence *sequence); GDK_AVAILABLE_IN_3_14 -gboolean gtk_gesture_cancel_sequence (GtkGesture *gesture, - GdkEventSequence *sequence); -GDK_AVAILABLE_IN_3_14 const GdkEvent * gtk_gesture_get_last_event (GtkGesture *gesture, GdkEventSequence *sequence); @@ -98,9 +95,6 @@ GDK_AVAILABLE_IN_3_14 gboolean gtk_gesture_is_recognized (GtkGesture *gesture); GDK_AVAILABLE_IN_3_14 -gboolean gtk_gesture_check (GtkGesture *gesture); - -GDK_AVAILABLE_IN_3_14 GdkWindow * gtk_gesture_get_window (GtkGesture *gesture); GDK_AVAILABLE_IN_3_14 diff --git a/gtk/gtkgestureprivate.h b/gtk/gtkgestureprivate.h index d66b3ee093..30c4cd44e2 100644 --- a/gtk/gtkgestureprivate.h +++ b/gtk/gtkgestureprivate.h @@ -63,6 +63,9 @@ gboolean _gtk_gesture_get_pointer_emulating_sequence (GtkGesture *gesture, GdkEventSequence **sequence); +gboolean _gtk_gesture_cancel_sequence (GtkGesture *gesture, + GdkEventSequence *sequence); + G_END_DECLS #endif /* __GTK_GESTURE_PRIVATE_H__ */ diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 98569ad8d1..3a8205e98c 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4290,8 +4290,7 @@ _gtk_widget_cancel_sequence (GtkWidget *widget, if (!gtk_gesture_handles_sequence (gesture, seq)) continue; - handled |= - gtk_gesture_cancel_sequence (gesture, seq); + handled |= _gtk_gesture_cancel_sequence (gesture, seq); } return handled; |