[gtk+/gestures: 138/202] gesture: make gtk_gesture_cancel_sequence() private
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gestures: 138/202] gesture: make gtk_gesture_cancel_sequence() private
- Date: Fri, 23 May 2014 18:07:58 +0000 (UTC)
commit 8ab35016a63b9e10dbfd1e268d1610b53da1727b
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue May 6 18:10:32 2014 +0200
gesture: make gtk_gesture_cancel_sequence() private
gtk/gtkgesture.c | 16 +++-------------
gtk/gtkgesture.h | 6 ------
gtk/gtkgestureprivate.h | 3 +++
gtk/gtkwidget.c | 3 +--
4 files changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index 131d6ca..8b99354 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 c90b8f1..cac48aa 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 d66b3ee..30c4cd4 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 98569ad..3a8205e 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]