From 87a33cb1b62e1f7b8e41977a72e05e59b9c3dcee Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 7 Oct 2023 04:28:14 +0300 Subject: [PATCH 57/57] gtk4: Drop "Recalculate Borders" completely That menu entry was already commented out. See osdn #48811 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/menu.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/client/gui-gtk-4.0/menu.c b/client/gui-gtk-4.0/menu.c index 2b93b82e11..6aeb4feded 100644 --- a/client/gui-gtk-4.0/menu.c +++ b/client/gui-gtk-4.0/menu.c @@ -347,11 +347,6 @@ static void show_focus_unit_callback(GSimpleAction *action, static void show_fog_of_war_callback(GSimpleAction *action, GVariant *parameter, gpointer data); - -#ifdef MENUS_GTK3 -static void recalc_borders_callback(GtkMenuItem *item, gpointer data); -#endif /* MENUS_GTK3 */ - static void toggle_fog_callback(GSimpleAction *action, GVariant *parameter, gpointer data); @@ -1010,12 +1005,6 @@ static struct menu_entry_info menu_entries[] = { "HELP_ABOUT", N_("About Freeciv"), "help_about", NULL, MGROUP_SAFE, NULL, FALSE }, - -#ifdef MENUS_GTK3 - { "RECALC_BORDERS", N_("Recalculate _Borders"), 0, 0, - G_CALLBACK(recalc_borders_callback), MGROUP_EDIT }, -#endif /* MENUS_GTK3 */ - { NULL } }; @@ -2084,16 +2073,6 @@ static void full_screen_callback(GSimpleAction *action, GVariant *parameter, create_toggle_menu_item(info)); } -#ifdef MENUS_GTK3 -/************************************************************************//** - Item "RECALC_BORDERS" callback. -****************************************************************************/ -static void recalc_borders_callback(GtkMenuItem *item, gpointer data) -{ - key_editor_recalculate_borders(); -} -#endif /* MENUS_GTK3 */ - /************************************************************************//** Item "TOGGLE_FOG" callback. ****************************************************************************/ -- 2.40.1