From 443fd4d63d9b2756071e0433c5a536740d9788e8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 11 Apr 2020 14:54:08 -0400 Subject: [PATCH] tests: Stop using gtk_get_current_ apis Replace these by equivalent event controller apis where needed. --- tests/testinhibitshortcuts.c | 4 +--- tests/testwindowdrag.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/testinhibitshortcuts.c b/tests/testinhibitshortcuts.c index fa746ed3e4..6de7a89cfe 100644 --- a/tests/testinhibitshortcuts.c +++ b/tests/testinhibitshortcuts.c @@ -40,7 +40,6 @@ static void on_button_toggle (GtkWidget *button, gpointer data) { GdkSurface *surface = GDK_SURFACE (data); - GdkEvent *event; if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) { @@ -49,8 +48,7 @@ on_button_toggle (GtkWidget *button, gpointer data) } gtk_check_button_set_inconsistent (GTK_CHECK_BUTTON (button), TRUE); - event = gtk_get_current_event (); - gdk_toplevel_inhibit_system_shortcuts (GDK_TOPLEVEL (surface), event); + gdk_toplevel_inhibit_system_shortcuts (GDK_TOPLEVEL (surface), NULL); } static void diff --git a/tests/testwindowdrag.c b/tests/testwindowdrag.c index e25abf0cef..07c7735f59 100644 --- a/tests/testwindowdrag.c +++ b/tests/testwindowdrag.c @@ -19,7 +19,7 @@ start_resize (GtkGestureClick *gesture, gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED); surface = gtk_native_get_surface (gtk_widget_get_native (widget)); - event = gtk_get_current_event (); + event = gtk_event_controller_get_current_event (GTK_EVENT_CONTROLLER (gesture)); if (gdk_event_get_event_type (event) == GDK_BUTTON_PRESS) button = gdk_button_event_get_button (event); else @@ -67,7 +67,7 @@ start_move (GtkGestureClick *gesture, gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED); surface = gtk_native_get_surface (gtk_widget_get_native (widget)); - event = gtk_get_current_event (); + event = gtk_event_controller_get_current_event (GTK_EVENT_CONTROLLER (gesture)); if (gdk_event_get_event_type (event) == GDK_BUTTON_PRESS) button = gdk_button_event_get_button (event); else