From 509017f0d280c0cc782ad81399e0b6a617785a91 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 22 Aug 2026 03:57:27 +0300 Subject: [PATCH 56/56] gtk: Drop unused bottom_hpaned See RM #2157 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/gui_main.c | 3 --- client/gui-gtk-4.0/gui_main.c | 3 --- client/gui-gtk-5.0/gui_main.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/client/gui-gtk-3.22/gui_main.c b/client/gui-gtk-3.22/gui_main.c index 4bf4c43957..d0dd0ccf64 100644 --- a/client/gui-gtk-3.22/gui_main.c +++ b/client/gui-gtk-3.22/gui_main.c @@ -129,7 +129,6 @@ GtkWidget *toplevel_tabs; GtkWidget *top_vbox; GtkWidget *top_notebook, *bottom_notebook, *right_notebook; GtkWidget *map_widget; -static GtkWidget *bottom_hpaned; PangoFontDescription *city_names_style = NULL; PangoFontDescription *city_productions_style = NULL; @@ -1561,7 +1560,6 @@ static void setup_widgets(void) /* *** The message window -- this is a detachable widget *** */ if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) { - bottom_hpaned = paned; right_notebook = bottom_notebook = top_notebook; } else { GtkWidget *hpaned; @@ -1585,7 +1583,6 @@ static void setup_widgets(void) } gtk_container_add(GTK_CONTAINER(vgrid), hpaned); g_object_set(hpaned, "margin", 4, NULL); - bottom_hpaned = hpaned; bottom_notebook = gtk_notebook_new(); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(bottom_notebook), GTK_POS_TOP); diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 0bb114f548..18628227a3 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -128,7 +128,6 @@ GtkWidget *toplevel_tabs; GtkWidget *top_vbox; GtkWidget *top_notebook, *bottom_notebook, *right_notebook; GtkWidget *map_widget; -static GtkWidget *bottom_hpaned; PangoFontDescription *city_names_style = NULL; PangoFontDescription *city_productions_style = NULL; @@ -1520,7 +1519,6 @@ static void setup_widgets(void) /* *** The message window -- this is a detachable widget *** */ if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) { - bottom_hpaned = paned; right_notebook = bottom_notebook = top_notebook; } else { GtkWidget *hpaned; @@ -1545,7 +1543,6 @@ static void setup_widgets(void) gtk_widget_set_margin_end(hpaned, 4); gtk_widget_set_margin_start(hpaned, 4); gtk_widget_set_margin_top(hpaned, 4); - bottom_hpaned = hpaned; bottom_notebook = gtk_notebook_new(); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(bottom_notebook), GTK_POS_TOP); diff --git a/client/gui-gtk-5.0/gui_main.c b/client/gui-gtk-5.0/gui_main.c index 5f415229df..1b806ca75d 100644 --- a/client/gui-gtk-5.0/gui_main.c +++ b/client/gui-gtk-5.0/gui_main.c @@ -128,7 +128,6 @@ GtkWidget *toplevel_tabs; GtkWidget *top_vbox; GtkWidget *top_notebook, *bottom_notebook, *right_notebook; GtkWidget *map_widget; -static GtkWidget *bottom_hpaned; PangoFontDescription *city_names_style = NULL; PangoFontDescription *city_productions_style = NULL; @@ -1521,7 +1520,6 @@ static void setup_widgets(void) /* *** The message window -- this is a detachable widget *** */ if (GUI_GTK_OPTION(message_chat_location) == GUI_GTK_MSGCHAT_MERGED) { - bottom_hpaned = paned; right_notebook = bottom_notebook = top_notebook; } else { GtkWidget *hpaned; @@ -1546,7 +1544,6 @@ static void setup_widgets(void) gtk_widget_set_margin_end(hpaned, 4); gtk_widget_set_margin_start(hpaned, 4); gtk_widget_set_margin_top(hpaned, 4); - bottom_hpaned = hpaned; bottom_notebook = gtk_notebook_new(); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(bottom_notebook), GTK_POS_TOP); -- 2.53.0