summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2018-03-10 18:05:57 +0100
committerCarlos Garnacho <carlosg@gnome.org>2018-04-26 17:59:42 +0200
commit1e6eb1f8b94ad10f30678285860dc24877bbbac3 (patch)
treeeef4b5f579a657072967e7f7dd047494af5add1d /demos
parentbf82149271b4f6bf6379b22eeea191dffe6823dd (diff)
downloadgtk+-1e6eb1f8b94ad10f30678285860dc24877bbbac3.tar.gz
draggesture: Port to new API model
Diffstat (limited to 'demos')
-rw-r--r--demos/gtk-demo/drawingarea.c5
-rw-r--r--demos/gtk-demo/fontplane.c13
2 files changed, 9 insertions, 9 deletions
diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 4a6f1cb860..12967daa44 100644
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -244,13 +244,14 @@ do_drawingarea (GtkWidget *do_widget)
g_signal_connect (da, "size-allocate",
G_CALLBACK (scribble_size_allocate), NULL);
- drag = gtk_gesture_drag_new (da);
+ drag = gtk_gesture_drag_new ();
gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
- g_object_set_data_full (G_OBJECT (da), "drag", drag, g_object_unref);
+ gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);
g_signal_connect (drag, "drag-update", G_CALLBACK (drag_update), da);
g_signal_connect (drag, "drag-end", G_CALLBACK (drag_end), da);
+
}
if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/fontplane.c b/demos/gtk-demo/fontplane.c
index 6f31c2d8c5..987dedcebf 100644
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -212,14 +212,15 @@ gtk_font_plane_init (GtkFontPlane *plane)
gtk_widget_set_has_surface (GTK_WIDGET (plane), FALSE);
gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
- plane->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (plane));
- g_signal_connect (plane->drag_gesture, "drag-begin",
+ gesture = gtk_gesture_drag_new ();
+ g_signal_connect (gesture, "drag-begin",
G_CALLBACK (plane_drag_gesture_begin), plane);
- g_signal_connect (plane->drag_gesture, "drag-update",
+ g_signal_connect (gesture, "drag-update",
G_CALLBACK (plane_drag_gesture_update), plane);
- g_signal_connect (plane->drag_gesture, "drag-end",
+ g_signal_connect (gesture, "drag-end",
G_CALLBACK (plane_drag_gesture_end), plane);
- gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (plane->drag_gesture), 0);
+ gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
+ gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
gesture = gtk_gesture_long_press_new ();
g_signal_connect (gesture, "pressed",
@@ -237,8 +238,6 @@ plane_finalize (GObject *object)
g_clear_object (&plane->weight_adj);
g_clear_object (&plane->width_adj);
- g_clear_object (&plane->drag_gesture);
-
G_OBJECT_CLASS (gtk_font_plane_parent_class)->finalize (object);
}