[gtk+/wip/matthiasc/kill-key-events2: 32/48] testsuite: Don't use ::key-press-event

[Matthias Clasen <matthiasc src gnome org>]

commit 5068522fa831fde9ed4df3398e316006ade9c6de
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jan 31 12:35:05 2018 +0100

    testsuite: Don't use ::key-press-event
    
    We don't need it here.

 testsuite/gtk/window.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/testsuite/gtk/window.c b/testsuite/gtk/window.c
index ba289f2..758c108 100644
--- a/testsuite/gtk/window.c
+++ b/testsuite/gtk/window.c
@@ -40,11 +40,13 @@ on_draw (GtkDrawingArea *da,
 }
 
 static gboolean
-on_keypress (GtkWidget *widget)
+on_keypress (GtkWidget *widget,
+             GdkEvent  *event)
 {
-  gtk_main_quit ();
+  if (gdk_event_get_event_type (event) == GDK_KEY_PRESS)
+    gtk_main_quit ();
 
-  return TRUE;
+  return GDK_EVENT_PROPAGATE;
 }
 
 static void
@@ -56,7 +58,7 @@ test_default_size (void)
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   if (interactive)
-    g_signal_connect (window, "key-press-event", G_CALLBACK (on_keypress), NULL);
+    g_signal_connect (window, "event", G_CALLBACK (on_keypress), NULL);
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
@@ -133,7 +135,7 @@ test_resize (void)
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   if (interactive)
-    g_signal_connect (window, "key-press-event", G_CALLBACK (on_keypress), NULL);
+    g_signal_connect (window, "event", G_CALLBACK (on_keypress), NULL);
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);