From a02f9519eba7b6152fdd18da113735c1dfa7fdf1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 3 Oct 2021 08:33:25 +0300 Subject: [PATCH 48/48] gtk4: Replace use of "delete_event" signal with "close-request" See osdn #42979 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/action_dialog.c | 6 ++---- client/gui-gtk-4.0/gui_main.c | 2 +- client/gui-gtk-4.0/gui_stuff.c | 7 +++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/client/gui-gtk-4.0/action_dialog.c b/client/gui-gtk-4.0/action_dialog.c index 58b57013bd..06ad30e47d 100644 --- a/client/gui-gtk-4.0/action_dialog.c +++ b/client/gui-gtk-4.0/action_dialog.c @@ -1224,9 +1224,7 @@ static void act_sel_cancel_callback(GtkWidget *w, gpointer data) /**********************************************************************//** Action selection dialog has been closed **************************************************************************/ -static void act_sel_close_callback(GtkWidget *w, - gint response_id, - gpointer data) +static void act_sel_close_callback(GtkWidget *w, gpointer data) { gtk_widget_destroy(act_sel_dialog); free(act_sel_dialog_data); @@ -1559,7 +1557,7 @@ void popup_action_selection(struct unit *actor_unit, choice_dialog_set_hide(shl, TRUE); g_signal_connect(shl, "destroy", G_CALLBACK(act_sel_destroy_callback), NULL); - g_signal_connect(shl, "delete_event", + g_signal_connect(shl, "close-request", G_CALLBACK(act_sel_close_callback), GINT_TO_POINTER(ACTION_NONE)); diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 8b18673f21..810221c7f2 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -1833,7 +1833,7 @@ static void activate_gui(GtkApplication *app, gpointer data) gtk_window_set_title(GTK_WINDOW(toplevel), _("Freeciv")); - g_signal_connect(toplevel, "delete_event", + g_signal_connect(toplevel, "close-request", G_CALLBACK(quit_dialog_callback), NULL); /* Disable GTK cursor key focus movement */ diff --git a/client/gui-gtk-4.0/gui_stuff.c b/client/gui-gtk-4.0/gui_stuff.c index 8e12e189e8..9e61aeda2e 100644 --- a/client/gui-gtk-4.0/gui_stuff.c +++ b/client/gui-gtk-4.0/gui_stuff.c @@ -343,8 +343,7 @@ static void gui_dialog_destroy_handler(GtkWidget *w, struct gui_dialog *dlg) needs to know when a deletion took place. Popup dialog version **************************************************************************/ -static gint gui_dialog_delete_handler(GtkWidget *widget, - GdkEventAny *ev, gpointer data) +static gint gui_dialog_delete_handler(GtkWidget *widget, gpointer data) { struct gui_dialog *dlg = data; @@ -463,7 +462,7 @@ static void gui_dialog_detach(struct gui_dialog* dlg) gtk_container_add(GTK_CONTAINER(window), dlg->vbox); dlg->v.window = window; - g_signal_connect(window, "delete_event", + g_signal_connect(window, "close-request", G_CALLBACK(gui_dialog_delete_handler), dlg); gtk_window_set_default_size(GTK_WINDOW(dlg->v.window), @@ -577,7 +576,7 @@ void gui_dialog_new(struct gui_dialog **pdlg, GtkNotebook *notebook, gtk_container_add(GTK_CONTAINER(window), vbox); dlg->v.window = window; - g_signal_connect(window, "delete_event", + g_signal_connect(window, "close-request", G_CALLBACK(gui_dialog_delete_handler), dlg); } -- 2.33.0