[gtk+/gestures: 140/202] gesture: Make gtk_gesture_get_last_update_time() private
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gestures: 140/202] gesture: Make gtk_gesture_get_last_update_time() private
- Date: Fri, 23 May 2014 18:08:08 +0000 (UTC)
commit 44a960199b495bd0e4863e81f1def1e717450a93
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue May 6 18:22:57 2014 +0200
gesture: Make gtk_gesture_get_last_update_time() private
docs/reference/gtk/gtk3-sections.txt | 1 -
gtk/gtkgesture.c | 20 +++-----------------
gtk/gtkgesture.h | 5 -----
gtk/gtkgestureprivate.h | 4 ++++
gtk/gtkgestureswipe.c | 5 +++--
5 files changed, 10 insertions(+), 25 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index dd8a07e..b8727b9 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -7936,7 +7936,6 @@ gtk_gesture_detach
<SUBSECTION>
gtk_gesture_get_last_updated_sequence
-gtk_gesture_get_last_update_time
gtk_gesture_get_last_event
gtk_gesture_get_point
gtk_gesture_get_bounding_box
diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index 07ae863..8a8de71 100644
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -993,24 +993,10 @@ gtk_gesture_get_point (GtkGesture *gesture,
return TRUE;
}
-/**
- * gtk_gesture_get_last_update_time:
- * @gesture: a #GtkGesture
- * @sequence: (allow-none): a #GdkEventSequence, or %NULL for pointer events
- * @evtime: (out) (allow-none): return location for last update time
- *
- * If @sequence is being interpreted by @gesture, this function
- * returns %TRUE and fills @evtime with the last event time it
- * received from that @sequence.
- *
- * Returns: %TRUE if @sequence is currently interpreted
- *
- * Since: 3.14
- **/
gboolean
-gtk_gesture_get_last_update_time (GtkGesture *gesture,
- GdkEventSequence *sequence,
- guint32 *evtime)
+_gtk_gesture_get_last_update_time (GtkGesture *gesture,
+ GdkEventSequence *sequence,
+ guint32 *evtime)
{
GtkGesturePrivate *priv;
PointData *data;
diff --git a/gtk/gtkgesture.h b/gtk/gtkgesture.h
index cac48aa..e3e4938 100644
--- a/gtk/gtkgesture.h
+++ b/gtk/gtkgesture.h
@@ -76,11 +76,6 @@ gboolean gtk_gesture_get_point (GtkGesture *gesture,
gdouble *x,
gdouble *y);
GDK_AVAILABLE_IN_3_14
-gboolean gtk_gesture_get_last_update_time (GtkGesture *gesture,
- GdkEventSequence *sequence,
- guint32 *evtime);
-
-GDK_AVAILABLE_IN_3_14
gboolean gtk_gesture_get_bounding_box (GtkGesture *gesture,
GdkRectangle *rect);
GDK_AVAILABLE_IN_3_14
diff --git a/gtk/gtkgestureprivate.h b/gtk/gtkgestureprivate.h
index 30c4cd4..fd21994 100644
--- a/gtk/gtkgestureprivate.h
+++ b/gtk/gtkgestureprivate.h
@@ -66,6 +66,10 @@ gboolean _gtk_gesture_get_pointer_emulating_sequence
gboolean _gtk_gesture_cancel_sequence (GtkGesture *gesture,
GdkEventSequence *sequence);
+gboolean _gtk_gesture_get_last_update_time (GtkGesture *gesture,
+ GdkEventSequence *sequence,
+ guint32 *evtime);
+
G_END_DECLS
#endif /* __GTK_GESTURE_PRIVATE_H__ */
diff --git a/gtk/gtkgestureswipe.c b/gtk/gtkgestureswipe.c
index 25a714e..3107675 100644
--- a/gtk/gtkgestureswipe.c
+++ b/gtk/gtkgestureswipe.c
@@ -38,6 +38,7 @@
#include "config.h"
#include "gtkgestureswipe.h"
#include "gtkgestureswipeprivate.h"
+#include "gtkgestureprivate.h"
#include "gtkmarshalers.h"
#define CAPTURE_THRESHOLD_MS 150
@@ -112,7 +113,7 @@ gtk_gesture_swipe_update (GtkGesture *gesture,
gdouble x, y;
priv = gtk_gesture_swipe_get_instance_private (swipe);
- gtk_gesture_get_last_update_time (gesture, sequence, &new.evtime);
+ _gtk_gesture_get_last_update_time (gesture, sequence, &new.evtime);
gtk_gesture_get_point (gesture, sequence, &x, &y);
new.point.x = x;
@@ -137,7 +138,7 @@ _gtk_gesture_swipe_calculate_velocity (GtkGestureSwipe *gesture,
*velocity_x = *velocity_y = 0;
sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
- gtk_gesture_get_last_update_time (GTK_GESTURE (gesture), sequence, &evtime);
+ _gtk_gesture_get_last_update_time (GTK_GESTURE (gesture), sequence, &evtime);
_gtk_gesture_swipe_clear_backlog (gesture, evtime);
if (priv->events->len == 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]