pinchpan: Move to GtkGesture

4 files changed, 16 insertions, 10 deletions

diff --git a/gtk/gtkpinchpangesture.c b/gtk/gtkpinchpangesture.c
index cf1ad46afd..6f8fc281cf 100644
--- a/gtk/gtkpinchpangesture.c
+++ b/gtk/gtkpinchpangesture.c
@@ -51,7 +51,7 @@ struct _GtkPinchPanGesturePrivate {
   double              initial_angle;
 };
 
-G_DEFINE_TYPE (GtkPinchPanGesture, gtk_pinch_pan_gesture, GTK_TYPE_EVENT_TRACKER)
+G_DEFINE_TYPE (GtkPinchPanGesture, gtk_pinch_pan_gesture, GTK_TYPE_GESTURE)
 
 static void
 gtk_pinch_pan_gesture_set_property (GObject      *object,
@@ -125,9 +125,15 @@ _gtk_pinch_pan_gesture_begin (GtkPinchPanGesture *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])
     {
diff --git a/gtk/gtkpinchpangesture.h b/gtk/gtkpinchpangesture.h
index 46a57649c7..26c874dfbf 100644
--- a/gtk/gtkpinchpangesture.h
+++ b/gtk/gtkpinchpangesture.h
@@ -25,7 +25,7 @@
 #ifndef __GTK_PINCH_PAN_GESTURE_H__
 #define __GTK_PINCH_PAN_GESTURE_H__
 
-#include <gtk/gtkeventtracker.h>
+#include <gtk/gtkgesture.h>
 
 G_BEGIN_DECLS
 
@@ -42,14 +42,14 @@ typedef struct _GtkPinchPanGesturePrivate    GtkPinchPanGesturePrivate;
 
 struct _GtkPinchPanGesture
 {
-  GtkEventTracker parent;
+  GtkGesture parent;
 
   GtkPinchPanGesturePrivate *priv;
 };
 
 struct _GtkPinchPanGestureClass
 {
-  GtkEventTrackerClass parent_class;
+  GtkGestureClass parent_class;
 
   /* Padding for future expansion */
   void (*_gtk_reserved0) (void);
diff --git a/gtk/gtkpinchpanrecognizer.c b/gtk/gtkpinchpanrecognizer.c
index bc841b8ce9..fec4719219 100644
--- a/gtk/gtkpinchpanrecognizer.c
+++ b/gtk/gtkpinchpanrecognizer.c
@@ -35,7 +35,7 @@
  * #GtkPinchPanRecognizer was added in GTK 3.6.
  */
 
-G_DEFINE_TYPE (GtkPinchPanRecognizer, gtk_pinch_pan_recognizer, GTK_TYPE_EVENT_RECOGNIZER)
+G_DEFINE_TYPE (GtkPinchPanRecognizer, gtk_pinch_pan_recognizer, GTK_TYPE_GESTURE_RECOGNIZER)
 
 static void
 gtk_pinch_pan_recognizer_recognize (GtkEventRecognizer *recognizer,
diff --git a/gtk/gtkpinchpanrecognizer.h b/gtk/gtkpinchpanrecognizer.h
index d39e554357..2132c78fc3 100644
--- a/gtk/gtkpinchpanrecognizer.h
+++ b/gtk/gtkpinchpanrecognizer.h
@@ -25,7 +25,7 @@
 #ifndef __GTK_PINCH_PAN_RECOGNIZER_H__
 #define __GTK_PINCH_PAN_RECOGNIZER_H__
 
-#include <gtk/gtkeventrecognizer.h>
+#include <gtk/gtkgesturerecognizer.h>
 
 G_BEGIN_DECLS
 
@@ -42,14 +42,14 @@ typedef struct _GtkPinchPanRecognizerPrivate    GtkPinchPanRecognizerPrivate;
 
 struct _GtkPinchPanRecognizer
 {
-  GtkEventRecognizer parent;
+  GtkGestureRecognizer parent;
 
   GtkPinchPanRecognizerPrivate *priv;
 };
 
 struct _GtkPinchPanRecognizerClass
 {
-  GtkEventRecognizerClass parent_class;
+  GtkGestureRecognizerClass parent_class;
 
   /* Padding for future expansion */
   void (*_gtk_reserved0) (void);