[gtk+/wip/events: 23/25] swipe: Move to GtkGesture
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/events: 23/25] swipe: Move to GtkGesture
- Date: Wed, 14 Mar 2012 18:43:41 +0000 (UTC)
commit 55421f7fed878330c815ee749a156adab73a62f7
Author: Benjamin Otte <otte redhat com>
Date: Tue Mar 13 21:41:41 2012 +0100
swipe: Move to GtkGesture
gtk/gtkswipegesture.c | 12 +++++++++---
gtk/gtkswipegesture.h | 6 +++---
gtk/gtkswiperecognizer.c | 2 +-
gtk/gtkswiperecognizer.h | 6 +++---
4 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkswipegesture.c b/gtk/gtkswipegesture.c
index d3905e3..9194f4b 100644
--- a/gtk/gtkswipegesture.c
+++ b/gtk/gtkswipegesture.c
@@ -52,7 +52,7 @@ struct _GtkSwipeGesturePrivate {
GtkMovementDirection direction;
};
-G_DEFINE_TYPE (GtkSwipeGesture, gtk_swipe_gesture, GTK_TYPE_EVENT_TRACKER)
+G_DEFINE_TYPE (GtkSwipeGesture, gtk_swipe_gesture, GTK_TYPE_GESTURE)
static void
gtk_swipe_gesture_set_property (GObject *object,
@@ -130,9 +130,15 @@ _gtk_swipe_gesture_begin (GtkSwipeGesture *gesture,
return FALSE;
if (priv->sequence[0] == NULL)
- priv->sequence[0] = _gtk_sequence_tracker_new (event);
+ {
+ priv->sequence[0] = _gtk_sequence_tracker_new (event);
+ gtk_gesture_add_sequence (GTK_GESTURE (gesture), event->touch.sequence);
+ }
else
- priv->sequence[1] = _gtk_sequence_tracker_new (event);
+ {
+ priv->sequence[1] = _gtk_sequence_tracker_new (event);
+ gtk_gesture_add_sequence (GTK_GESTURE (gesture), event->touch.sequence);
+ }
if (priv->sequence[1])
gtk_event_tracker_start (GTK_EVENT_TRACKER (gesture));
diff --git a/gtk/gtkswipegesture.h b/gtk/gtkswipegesture.h
index 63f3c13..7b4de2e 100644
--- a/gtk/gtkswipegesture.h
+++ b/gtk/gtkswipegesture.h
@@ -25,7 +25,7 @@
#ifndef __GTK_SWIPE_GESTURE_H__
#define __GTK_SWIPE_GESTURE_H__
-#include <gtk/gtkeventtracker.h>
+#include <gtk/gtkgesture.h>
G_BEGIN_DECLS
@@ -42,14 +42,14 @@ typedef struct _GtkSwipeGesturePrivate GtkSwipeGesturePrivate;
struct _GtkSwipeGesture
{
- GtkEventTracker parent;
+ GtkGesture parent;
GtkSwipeGesturePrivate *priv;
};
struct _GtkSwipeGestureClass
{
- GtkEventTrackerClass parent_class;
+ GtkGestureClass parent_class;
/* Padding for future expansion */
void (*_gtk_reserved0) (void);
diff --git a/gtk/gtkswiperecognizer.c b/gtk/gtkswiperecognizer.c
index 047828a..c411bc3 100644
--- a/gtk/gtkswiperecognizer.c
+++ b/gtk/gtkswiperecognizer.c
@@ -35,7 +35,7 @@
* #GtkSwipeRecognizer was added in GTK 3.6.
*/
-G_DEFINE_TYPE (GtkSwipeRecognizer, gtk_swipe_recognizer, GTK_TYPE_EVENT_RECOGNIZER)
+G_DEFINE_TYPE (GtkSwipeRecognizer, gtk_swipe_recognizer, GTK_TYPE_GESTURE_RECOGNIZER)
static void
gtk_swipe_recognizer_recognize (GtkEventRecognizer *recognizer,
diff --git a/gtk/gtkswiperecognizer.h b/gtk/gtkswiperecognizer.h
index 0df09ef..7a4e9cc 100644
--- a/gtk/gtkswiperecognizer.h
+++ b/gtk/gtkswiperecognizer.h
@@ -25,7 +25,7 @@
#ifndef __GTK_SWIPE_RECOGNIZER_H__
#define __GTK_SWIPE_RECOGNIZER_H__
-#include <gtk/gtkeventrecognizer.h>
+#include <gtk/gtkgesturerecognizer.h>
G_BEGIN_DECLS
@@ -42,14 +42,14 @@ typedef struct _GtkSwipeRecognizerPrivate GtkSwipeRecognizerPrivate;
struct _GtkSwipeRecognizer
{
- GtkEventRecognizer parent;
+ GtkGestureRecognizer parent;
GtkSwipeRecognizerPrivate *priv;
};
struct _GtkSwipeRecognizerClass
{
- GtkEventRecognizerClass parent_class;
+ GtkGestureRecognizerClass parent_class;
/* Padding for future expansion */
void (*_gtk_reserved0) (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]