From 26f716e5909f12dc0b15ad9ef0fecdd73bce5b48 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 26 Sep 2026 02:20:21 +0300 Subject: [PATCH 72/72] gtk4(x): Drop unused city_*_command See RM #2265 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/cityrep.c | 20 +++++++------------- client/gui-gtk-5.0/cityrep.c | 20 +++++++------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/client/gui-gtk-4.0/cityrep.c b/client/gui-gtk-4.0/cityrep.c index b463d15d09..80327bc0f7 100644 --- a/client/gui-gtk-4.0/cityrep.c +++ b/client/gui-gtk-4.0/cityrep.c @@ -110,9 +110,6 @@ static void recreate_production_menu(GActionGroup *group); static void recreate_select_menu(GActionGroup *group); static void recreate_sell_menu(GActionGroup *group); -static GtkWidget *city_center_command; -static GtkWidget *city_popup_command; -static GtkWidget *city_buy_command; static GtkWidget *city_total_buy_cost_label; static GMenu *prod_menu = NULL; @@ -1103,7 +1100,7 @@ static void create_city_report_dialog(bool make_modal) static char (*buf)[128]; struct city_report_spec *spec; - GtkWidget *w, *sw, *aux_menu; + GtkWidget *sw, *aux_menu; int i; gui_dialog_new(&city_dialog_shell, GTK_NOTEBOOK(top_notebook), NULL, TRUE); @@ -1126,17 +1123,14 @@ static void create_city_report_dialog(bool make_modal) gui_dialog_add_action_widget(city_dialog_shell, city_total_buy_cost_label); - w = gui_dialog_add_button(city_dialog_shell, NULL, - _("_Buy"), CITY_BUY); - city_buy_command = w; + gui_dialog_add_button(city_dialog_shell, NULL, + _("_Buy"), CITY_BUY); - w = gui_dialog_add_button(city_dialog_shell, NULL, - _("_Inspect"), CITY_POPUP); - city_popup_command = w; + gui_dialog_add_button(city_dialog_shell, NULL, + _("_Inspect"), CITY_POPUP); - w = gui_dialog_add_button(city_dialog_shell, NULL, - _("Cen_ter"), CITY_CENTER); - city_center_command = w; + gui_dialog_add_button(city_dialog_shell, NULL, + _("Cen_ter"), CITY_CENTER); /* Tree view */ buf = fc_realloc(buf, NUM_CREPORT_COLS * sizeof(buf[0])); diff --git a/client/gui-gtk-5.0/cityrep.c b/client/gui-gtk-5.0/cityrep.c index 697dc27cda..2e02f9fd3c 100644 --- a/client/gui-gtk-5.0/cityrep.c +++ b/client/gui-gtk-5.0/cityrep.c @@ -113,9 +113,6 @@ static void recreate_production_menu(GActionGroup *group); static void recreate_select_menu(GActionGroup *group); static void recreate_sell_menu(GActionGroup *group); -static GtkWidget *city_center_command; -static GtkWidget *city_popup_command; -static GtkWidget *city_buy_command; static GtkWidget *city_total_buy_cost_label; static GMenu *prod_menu = NULL; @@ -1273,7 +1270,7 @@ static void create_city_report_dialog(bool make_modal) static char (*buf)[128]; struct city_report_spec *spec; - GtkWidget *w, *sw, *aux_menu; + GtkWidget *sw, *aux_menu; int i; gui_dialog_new(&city_dialog_shell, GTK_NOTEBOOK(top_notebook), NULL, TRUE); @@ -1296,17 +1293,14 @@ static void create_city_report_dialog(bool make_modal) gui_dialog_add_action_widget(city_dialog_shell, city_total_buy_cost_label); - w = gui_dialog_add_button(city_dialog_shell, NULL, - _("_Buy"), CITY_BUY); - city_buy_command = w; + gui_dialog_add_button(city_dialog_shell, NULL, + _("_Buy"), CITY_BUY); - w = gui_dialog_add_button(city_dialog_shell, NULL, - _("_Inspect"), CITY_POPUP); - city_popup_command = w; + gui_dialog_add_button(city_dialog_shell, NULL, + _("_Inspect"), CITY_POPUP); - w = gui_dialog_add_button(city_dialog_shell, NULL, - _("Cen_ter"), CITY_CENTER); - city_center_command = w; + gui_dialog_add_button(city_dialog_shell, NULL, + _("Cen_ter"), CITY_CENTER); city_model_depr = city_report_dialog_store_new_depr(); -- 2.53.0