From 67649763b6f25d19852b9062290eb59085976955 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 31 Dec 2017 12:52:54 -0500 Subject: [PATCH] tests: Stop using the delete-event signal We can use ::destroy in most cases. --- tests/overlayscroll.c | 2 +- tests/showrendernode.c | 2 +- tests/testadjustsize.c | 15 +++++---------- tests/testappchooser.c | 3 +-- tests/testappchooserbutton.c | 3 +-- tests/testassistant.c | 6 ++---- tests/testbaseline.c | 2 +- tests/testbbox.c | 2 +- tests/testborderdrawing.c | 2 +- tests/testcalendar.c | 8 ++------ tests/testcenterbox.c | 2 +- tests/testfilechooserbutton.c | 13 +------------ tests/testflowbox.c | 3 +-- tests/testfontchooser.c | 3 +-- tests/testfontchooserdialog.c | 3 +-- tests/testframe.c | 2 +- tests/testgiconpixbuf.c | 3 +-- tests/testgmenu.c | 11 +---------- tests/testgtk.c | 23 +++++------------------ tests/testheightforwidth.c | 21 +-------------------- tests/testicontheme.c | 6 ++---- tests/testlevelbar.c | 12 +----------- tests/testnotebookdnd.c | 2 +- tests/testoutsetshadowdrawing.c | 2 +- tests/testplacesview.c | 2 +- tests/testpopover.c | 2 +- tests/testtreecolumnsizing.c | 2 +- tests/testwidgetfocus.c | 2 +- tests/visuals/visuals.c | 4 +--- 29 files changed, 40 insertions(+), 123 deletions(-) diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c index c8e57769ae..92db4c4d78 100644 --- a/tests/overlayscroll.c +++ b/tests/overlayscroll.c @@ -55,7 +55,7 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (window), 640, 480); - g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20); gtk_container_add (GTK_CONTAINER (window), box); diff --git a/tests/showrendernode.c b/tests/showrendernode.c index d1ab64eab7..298e0ec866 100644 --- a/tests/showrendernode.c +++ b/tests/showrendernode.c @@ -218,7 +218,7 @@ main (int argc, char **argv) MAX (600, node_bounds.size.width), MAX (500, node_bounds.size.height)); - g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); gtk_main (); diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c index b97b35c474..76abf27219 100644 --- a/tests/testadjustsize.c +++ b/tests/testadjustsize.c @@ -66,8 +66,7 @@ open_test_window (void) test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (test_window), "Tests"); - g_signal_connect (test_window, "delete-event", - G_CALLBACK (gtk_main_quit), test_window); + g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), test_window); gtk_window_set_resizable (GTK_WINDOW (test_window), FALSE); @@ -132,8 +131,7 @@ open_control_window (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Controls"); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_main_quit), window); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box); @@ -232,8 +230,7 @@ open_alignment_window (void) test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (test_window), "Alignment"); - g_signal_connect (test_window, "delete-event", - G_CALLBACK (gtk_main_quit), test_window); + g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_window_set_resizable (GTK_WINDOW (test_window), TRUE); gtk_window_set_default_size (GTK_WINDOW (test_window), 500, 500); @@ -294,8 +291,7 @@ open_margin_window (void) test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (test_window), "Margin"); - g_signal_connect (test_window, "delete-event", - G_CALLBACK (gtk_main_quit), test_window); + g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_window_set_resizable (GTK_WINDOW (test_window), TRUE); @@ -321,8 +317,7 @@ open_valigned_label_window (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (test_window, "delete-event", - G_CALLBACK (gtk_main_quit), test_window); + g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (box); diff --git a/tests/testappchooser.c b/tests/testappchooser.c index 1030f92482..baf9adcad2 100644 --- a/tests/testappchooser.c +++ b/tests/testappchooser.c @@ -221,8 +221,7 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (toplevel), grid); gtk_widget_show (toplevel); - g_signal_connect (toplevel, "delete-event", - G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_main (); diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c index 45be8a72aa..44476f5a7d 100644 --- a/tests/testappchooserbutton.c +++ b/tests/testappchooserbutton.c @@ -126,8 +126,7 @@ main (int argc, #endif gtk_widget_show (toplevel); - g_signal_connect (toplevel, "delete-event", - G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_main (); diff --git a/tests/testassistant.c b/tests/testassistant.c index 9d87879f77..d0331071c5 100644 --- a/tests/testassistant.c +++ b/tests/testassistant.c @@ -703,11 +703,9 @@ main (int argc, gchar *argv[]) gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE); - g_signal_connect (G_OBJECT (window), "destroy", - G_CALLBACK (gtk_main_quit), NULL); - g_signal_connect (G_OBJECT (window), "delete-event", - G_CALLBACK (gtk_false), NULL); + g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (window), box); diff --git a/tests/testbaseline.c b/tests/testbaseline.c index cd7cdad122..9554b8a8a0 100644 --- a/tests/testbaseline.c +++ b/tests/testbaseline.c @@ -88,7 +88,7 @@ main (int argc, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_object_unref (provider); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL); notebook = gtk_notebook_new (); gtk_container_add (GTK_CONTAINER (window), notebook); diff --git a/tests/testbbox.c b/tests/testbbox.c index ab3a6fbab2..892691301d 100644 --- a/tests/testbbox.c +++ b/tests/testbbox.c @@ -121,7 +121,7 @@ main (int argc, gtk_init (); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testborderdrawing.c b/tests/testborderdrawing.c index cb6d8605ed..80d5b81a96 100644 --- a/tests/testborderdrawing.c +++ b/tests/testborderdrawing.c @@ -151,7 +151,7 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (box), top); gtk_container_add (GTK_CONTAINER (box), bottom); gtk_container_add (GTK_CONTAINER (window), box); - g_signal_connect (window, "delete-event", gtk_main_quit, NULL); + g_signal_connect (window, "destroy", gtk_main_quit, NULL); gtk_widget_show (window); gtk_main (); diff --git a/tests/testcalendar.c b/tests/testcalendar.c index e8c2983248..f93bb56f7f 100644 --- a/tests/testcalendar.c +++ b/tests/testcalendar.c @@ -445,13 +445,9 @@ create_calendar(void) calendar_data.settings[i] = 0; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE); gtk_window_set_title (GTK_WINDOW (window), "GtkCalendar Example"); - g_signal_connect (window, "destroy", - G_CALLBACK (gtk_main_quit), - NULL); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_false), - NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); diff --git a/tests/testcenterbox.c b/tests/testcenterbox.c index 9d05d18762..326a728bfb 100644 --- a/tests/testcenterbox.c +++ b/tests/testcenterbox.c @@ -28,7 +28,7 @@ main (int argc, char *argv[]) gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END); gtk_center_box_set_end_widget (GTK_CENTER_BOX (box), child); - g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c index f11269d9d9..878a8e6c6e 100644 --- a/tests/testfilechooserbutton.c +++ b/tests/testfilechooserbutton.c @@ -41,17 +41,6 @@ static GOptionEntry entries[] = { static gchar *gtk_src_dir = NULL; -static gboolean -delete_event_cb (GtkWidget *editor, - gint response, - gpointer user_data) -{ - gtk_widget_hide (editor); - - return TRUE; -} - - static void print_selected_path_clicked_cb (GtkWidget *button, gpointer user_data) @@ -122,6 +111,7 @@ tests_button_clicked_cb (GtkButton *real_button, GtkWidget *box, *button; tests = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_hide_on_close (GTK_WINDOW (tests), TRUE); gtk_window_set_title (GTK_WINDOW (tests), "Tests - TestFileChooserButton"); gtk_window_set_transient_for (GTK_WINDOW (tests), @@ -155,7 +145,6 @@ tests_button_clicked_cb (GtkButton *real_button, gtk_box_pack_start (GTK_BOX (box), button); gtk_widget_show (button); - g_signal_connect (tests, "delete-event", G_CALLBACK (delete_event_cb), NULL); g_object_set_data (user_data, "tests-dialog", tests); } diff --git a/tests/testflowbox.c b/tests/testflowbox.c index 22092785ca..5a94ab6fcd 100644 --- a/tests/testflowbox.c +++ b/tests/testflowbox.c @@ -635,8 +635,7 @@ main (int argc, char *argv[]) window = create_window (); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_main_quit), window); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c index d89d1544d1..e7c349ce37 100644 --- a/tests/testfontchooser.c +++ b/tests/testfontchooser.c @@ -73,8 +73,7 @@ main (int argc, char *argv[]) gtk_widget_show (window); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); g_signal_connect (fontchooser, "notify::font", G_CALLBACK (notify_font_cb), NULL); g_signal_connect (fontchooser, "notify::preview-text", diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c index 4c31e29a58..e85c6dc773 100644 --- a/tests/testfontchooserdialog.c +++ b/tests/testfontchooserdialog.c @@ -111,8 +111,7 @@ main (int argc, char *argv[]) monospace_filter, NULL, NULL); } - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_main (); diff --git a/tests/testframe.c b/tests/testframe.c index 5da3c56cc5..d193eed022 100644 --- a/tests/testframe.c +++ b/tests/testframe.c @@ -153,7 +153,7 @@ int main (int argc, char **argv) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (window), 300, 300); - g_signal_connect (window, "delete-event", gtk_main_quit, NULL); + g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5)); g_object_set (vbox, "margin", 12, NULL); diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c index 2ce7f6c884..33930b3faa 100644 --- a/tests/testgiconpixbuf.c +++ b/tests/testgiconpixbuf.c @@ -70,8 +70,7 @@ main (int argc, gtk_widget_show (toplevel); - g_signal_connect (toplevel, "delete-event", - G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_main (); diff --git a/tests/testgmenu.c b/tests/testgmenu.c index 8940af501f..af91dc8c2a 100644 --- a/tests/testgmenu.c +++ b/tests/testgmenu.c @@ -597,15 +597,6 @@ create_add_remove_buttons (GActionGroup *group, #define BUS_NAME "org.gtk.TestMenus" #define OBJ_PATH "/org/gtk/TestMenus" -static gboolean -on_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) -{ - gtk_main_quit (); - return TRUE; -} - int main (int argc, char *argv[]) { @@ -639,7 +630,7 @@ main (int argc, char *argv[]) } window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (window, "delete-event", G_CALLBACK(on_delete_event), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (window), box); diff --git a/tests/testgtk.c b/tests/testgtk.c index 05257bceea..5aafd00ce5 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -1939,14 +1939,10 @@ create_listbox (GtkWidget *widget) int i; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE); gtk_window_set_display (GTK_WINDOW (window), display); - g_signal_connect (window, "destroy", - G_CALLBACK (gtk_widget_destroyed), - &window); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_true), - NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window); gtk_window_set_title (GTK_WINDOW (window), "listbox"); @@ -2283,15 +2279,11 @@ create_menus (GtkWidget *widget) GdkDisplay *display = gtk_widget_get_display (widget); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE); gtk_window_set_display (GTK_WINDOW (window), display); - g_signal_connect (window, "destroy", - G_CALLBACK (gtk_widget_destroyed), - &window); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_true), - NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window); accel_group = gtk_accel_group_new (); gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); @@ -7928,12 +7920,7 @@ create_main_window (void) gtk_window_move (GTK_WINDOW (window), 50, 20); gtk_window_set_default_size (GTK_WINDOW (window), -1, 400); - g_signal_connect (window, "destroy", - G_CALLBACK (gtk_main_quit), - NULL); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_false), - NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c index f8e29d47b3..5755b92417 100644 --- a/tests/testheightforwidth.c +++ b/tests/testheightforwidth.c @@ -831,24 +831,6 @@ create_window (void) return window; } -static gboolean -main_window_delete_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) -{ - gsize i; - - for (i = 0; i < G_N_ELEMENTS (interfaces); ++i) - { - if (interfaces[i].window) - gtk_widget_destroy (interfaces[i].window); - } - - gtk_widget_destroy (widget); - - gtk_main_quit (); - - return TRUE; -} - int main (int argc, char *argv[]) { @@ -858,8 +840,7 @@ main (int argc, char *argv[]) window = create_window (); - g_signal_connect (window, "delete-event", - G_CALLBACK (main_window_delete_cb), window); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); diff --git a/tests/testicontheme.c b/tests/testicontheme.c index 6126e02018..02e775dc68 100644 --- a/tests/testicontheme.c +++ b/tests/testicontheme.c @@ -122,8 +122,7 @@ main (int argc, char *argv[]) gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); g_object_unref (pixbuf); gtk_container_add (GTK_CONTAINER (window), image); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_main_quit), window); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); gtk_main (); @@ -149,8 +148,7 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); image = gtk_image_new (); gtk_container_add (GTK_CONTAINER (window), image); - g_signal_connect (window, "delete-event", - G_CALLBACK (gtk_main_quit), window); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); info = gtk_icon_theme_lookup_icon_for_scale (icon_theme, argv[3], size, scale, flags); diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c index 9f21e99cfc..255bd1d523 100644 --- a/tests/testlevelbar.c +++ b/tests/testlevelbar.c @@ -55,15 +55,6 @@ increase_level (gpointer data) return G_SOURCE_CONTINUE; } -static gboolean -window_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer _data) -{ - gtk_main_quit (); - return FALSE; -} - static void toggle (GtkSwitch *sw, GParamSpec *pspec, GtkLevelBar *bar) { @@ -102,8 +93,7 @@ main (int argc, char *argv[]) gtk_widget_show (window); - g_signal_connect (window, "delete-event", - G_CALLBACK (window_delete_event), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); g_timeout_add (100, increase_level, bar); gtk_main (); diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c index 26f7693ca5..9fd00e6500 100644 --- a/tests/testnotebookdnd.c +++ b/tests/testnotebookdnd.c @@ -334,7 +334,7 @@ main (gint argc, gchar *argv[]) gtk_container_add (GTK_CONTAINER (window), grid); gtk_window_set_default_size (GTK_WINDOW (window), 400, 400); - g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); diff --git a/tests/testoutsetshadowdrawing.c b/tests/testoutsetshadowdrawing.c index b76382510c..aeb4461de3 100644 --- a/tests/testoutsetshadowdrawing.c +++ b/tests/testoutsetshadowdrawing.c @@ -149,7 +149,7 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (box), top); gtk_container_add (GTK_CONTAINER (box), bottom); gtk_container_add (GTK_CONTAINER (window), box); - g_signal_connect (window, "delete-event", gtk_main_quit, NULL); + g_signal_connect (window, "destroy", gtk_main_quit, NULL); gtk_widget_show (window); gtk_main (); diff --git a/tests/testplacesview.c b/tests/testplacesview.c index c8f03c0cea..e258c4405d 100644 --- a/tests/testplacesview.c +++ b/tests/testplacesview.c @@ -18,7 +18,7 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (win), view); gtk_widget_show (win); - g_signal_connect (win, "delete-event", G_CALLBACK (gtk_main_quit), win); + g_signal_connect (win, "destroy", G_CALLBACK (gtk_main_quit), win); gtk_main (); diff --git a/tests/testpopover.c b/tests/testpopover.c index f77c7036f5..3ece11139b 100644 --- a/tests/testpopover.c +++ b/tests/testpopover.c @@ -156,7 +156,7 @@ main (int argc, char *argv[]) gtk_grid_attach (GTK_GRID (grid), combo, 2, 5, 1, 1); - g_signal_connect (win, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (win, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (win); gtk_main (); diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c index adf909d6fd..3f247771d3 100644 --- a/tests/testtreecolumnsizing.c +++ b/tests/testtreecolumnsizing.c @@ -175,7 +175,7 @@ main (int argc, char **argv) /* Window and box */ window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (window), 640, 480); - g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c index 978aee6431..c527abfe0d 100644 --- a/tests/testwidgetfocus.c +++ b/tests/testwidgetfocus.c @@ -287,7 +287,7 @@ main() gtk_window_set_decorated (GTK_WINDOW (window), FALSE); gtk_container_add (GTK_CONTAINER (window), widget); - g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); diff --git a/tests/visuals/visuals.c b/tests/visuals/visuals.c index 7089158ffe..7faed00536 100644 --- a/tests/visuals/visuals.c +++ b/tests/visuals/visuals.c @@ -42,9 +42,7 @@ create_dark_popup (GtkWidget *parent) gtk_window_set_decorated (GTK_WINDOW (popup), FALSE); gtk_widget_set_size_request (popup, 100, 100); gtk_window_set_resizable (GTK_WINDOW (popup), FALSE); - - g_signal_connect (popup, "delete-event", - G_CALLBACK (gtk_true), NULL); + gtk_window_set_hide_on_close (GTK_WINDOW (popup), TRUE); gtk_container_add (GTK_CONTAINER (popup), button); g_signal_connect (button, "toggled",