From f74e217a0f7db867a28178fa950669144440dc90 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 29 Jun 2023 03:32:47 +0300 Subject: [PATCH 29/29] gtk4: Fix closing Property Editor See osdn #48313 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/editprop.c | 2 +- client/gui-gtk-4.0/gui_stuff.c | 8 -------- client/gui-gtk-4.0/gui_stuff.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/client/gui-gtk-4.0/editprop.c b/client/gui-gtk-4.0/editprop.c index d920a76cab..0ea24f350d 100644 --- a/client/gui-gtk-4.0/editprop.c +++ b/client/gui-gtk-4.0/editprop.c @@ -4955,7 +4955,7 @@ property_page_new(enum editor_object_type objtype, button = gtk_button_new_with_mnemonic(_("_Close")); gtk_size_group_add_widget(sizegroup, button); g_signal_connect_swapped(button, "clicked", - G_CALLBACK(fc_gtk_widget_hide), pe->widget); + G_CALLBACK(gtk_window_close), pe->widget); gtk_grid_attach(GTK_GRID(hgrid2), button, grid2_col++, 0, 1, 1); /* Now create the properties panel. */ diff --git a/client/gui-gtk-4.0/gui_stuff.c b/client/gui-gtk-4.0/gui_stuff.c index 9027dfd97d..e4596d39c7 100644 --- a/client/gui-gtk-4.0/gui_stuff.c +++ b/client/gui-gtk-4.0/gui_stuff.c @@ -1171,11 +1171,3 @@ GtkWidget *widget_get_child(GtkWidget *wdg) { return gtk_widget_get_first_child(wdg); } - -/**********************************************************************//** - Callback to hide a widget. -**************************************************************************/ -void fc_gtk_widget_hide(GtkWidget *hide, void *data) -{ - gtk_widget_set_visible(GTK_WIDGET(data), FALSE); -} diff --git a/client/gui-gtk-4.0/gui_stuff.h b/client/gui-gtk-4.0/gui_stuff.h index ddb31be039..bcf9dacd0a 100644 --- a/client/gui-gtk-4.0/gui_stuff.h +++ b/client/gui-gtk-4.0/gui_stuff.h @@ -23,8 +23,6 @@ GtkWidget *icon_label_button_new(const gchar *icon_name, void gtk_stockbutton_set_label(GtkWidget *button, const gchar *label_text); void gtk_expose_now(GtkWidget *w); -void fc_gtk_widget_hide(GtkWidget *hide, void *data); - void intl_slist(int n, const char **s, bool *done); /* The standard GTK+ 2.0 API is braindamaged. this is slightly better! */ -- 2.40.1