diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2018-06-27 00:08:56 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2018-07-30 13:14:12 +0200 |
| commit | 1570c41efaa2e5279778beeb60049646b2e6e065 (patch) | |
| tree | 49ca239eb547e0fc2c880dd05f956d8ac111a78c | |
| parent | 5e0f2d7d200c6caf5a1baa9e0d042b5134cc98b2 (diff) | |
| download | gtk+-1570c41efaa2e5279778beeb60049646b2e6e065.tar.gz | |
testsuite: Update window test to use gestures when interactive
| -rw-r--r-- | testsuite/gtk/window.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/testsuite/gtk/window.c b/testsuite/gtk/window.c index 758c10802d..bb8310c787 100644 --- a/testsuite/gtk/window.c +++ b/testsuite/gtk/window.c @@ -40,11 +40,9 @@ on_draw (GtkDrawingArea *da, } static gboolean -on_keypress (GtkWidget *widget, - GdkEvent *event) +on_keypress (GtkEventControllerKey *key) { - if (gdk_event_get_event_type (event) == GDK_KEY_PRESS) - gtk_main_quit (); + gtk_main_quit (); return GDK_EVENT_PROPAGATE; } @@ -58,7 +56,11 @@ test_default_size (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); if (interactive) - g_signal_connect (window, "event", G_CALLBACK (on_keypress), NULL); + { + GtkEventController *controller = gtk_event_controller_key_new (); + g_signal_connect (controller, "key-pressed", G_CALLBACK (on_keypress), window); + gtk_widget_add_controller (window, controller); + } da = gtk_drawing_area_new (); gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL); @@ -135,7 +137,11 @@ test_resize (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); if (interactive) - g_signal_connect (window, "event", G_CALLBACK (on_keypress), NULL); + { + GtkEventController *controller = gtk_event_controller_key_new (); + g_signal_connect (controller, "key-pressed", G_CALLBACK (on_keypress), window); + gtk_widget_add_controller (window, controller); + } da = gtk_drawing_area_new (); gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL); |