From 410e746554594fb3947f6856fdf86556182ae89a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist <cazfi74@gmail.com> Date: Sun, 25 Sep 2022 04:44:29 +0300 Subject: [PATCH 35/35] gtk: Drop editbar.player_properties_button See osdn #45711 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- client/gui-gtk-3.0/editgui.c | 1 - client/gui-gtk-3.0/editgui.h | 1 - client/gui-gtk-3.22/editgui.c | 1 - client/gui-gtk-3.22/editgui.h | 1 - client/gui-gtk-4.0/editgui.c | 1 - client/gui-gtk-4.0/editgui.h | 1 - 6 files changed, 6 deletions(-) diff --git a/client/gui-gtk-3.0/editgui.c b/client/gui-gtk-3.0/editgui.c index 0f09f08daa..e9a2f1d7c0 100644 --- a/client/gui-gtk-3.0/editgui.c +++ b/client/gui-gtk-3.0/editgui.c @@ -601,7 +601,6 @@ static struct editbar *editbar_create(void) g_signal_connect(button, "clicked", G_CALLBACK(editbar_player_properties_button_clicked), eb); gtk_container_add(GTK_CONTAINER(hbox), button); - eb->player_properties_button = button; return eb; } diff --git a/client/gui-gtk-3.0/editgui.h b/client/gui-gtk-3.0/editgui.h index 04405d6d85..6bd944a8b8 100644 --- a/client/gui-gtk-3.0/editgui.h +++ b/client/gui-gtk-3.0/editgui.h @@ -29,7 +29,6 @@ struct editbar { GtkWidget *mode_buttons[NUM_EDITOR_TOOL_MODES]; GtkWidget *tool_buttons[NUM_EDITOR_TOOL_TYPES]; - GtkWidget *player_properties_button; struct tool_value_selector *tool_selectors[NUM_EDITOR_TOOL_TYPES]; GtkListStore *player_pov_store; diff --git a/client/gui-gtk-3.22/editgui.c b/client/gui-gtk-3.22/editgui.c index dd9b4f7f8c..0a787e1297 100644 --- a/client/gui-gtk-3.22/editgui.c +++ b/client/gui-gtk-3.22/editgui.c @@ -601,7 +601,6 @@ static struct editbar *editbar_create(void) g_signal_connect(button, "clicked", G_CALLBACK(editbar_player_properties_button_clicked), eb); gtk_container_add(GTK_CONTAINER(hbox), button); - eb->player_properties_button = button; return eb; } diff --git a/client/gui-gtk-3.22/editgui.h b/client/gui-gtk-3.22/editgui.h index 04405d6d85..6bd944a8b8 100644 --- a/client/gui-gtk-3.22/editgui.h +++ b/client/gui-gtk-3.22/editgui.h @@ -29,7 +29,6 @@ struct editbar { GtkWidget *mode_buttons[NUM_EDITOR_TOOL_MODES]; GtkWidget *tool_buttons[NUM_EDITOR_TOOL_TYPES]; - GtkWidget *player_properties_button; struct tool_value_selector *tool_selectors[NUM_EDITOR_TOOL_TYPES]; GtkListStore *player_pov_store; diff --git a/client/gui-gtk-4.0/editgui.c b/client/gui-gtk-4.0/editgui.c index ecb7e1537c..ca5cb9ad0c 100644 --- a/client/gui-gtk-4.0/editgui.c +++ b/client/gui-gtk-4.0/editgui.c @@ -606,7 +606,6 @@ static struct editbar *editbar_create(void) g_signal_connect(button, "clicked", G_CALLBACK(editbar_player_properties_button_clicked), eb); gtk_box_append(GTK_BOX(hbox), button); - eb->player_properties_button = button; return eb; } diff --git a/client/gui-gtk-4.0/editgui.h b/client/gui-gtk-4.0/editgui.h index 27f5782a96..f4d5c2a5f1 100644 --- a/client/gui-gtk-4.0/editgui.h +++ b/client/gui-gtk-4.0/editgui.h @@ -29,7 +29,6 @@ struct editbar { GtkWidget *mode_buttons[NUM_EDITOR_TOOL_MODES]; GtkWidget *tool_buttons[NUM_EDITOR_TOOL_TYPES]; /* TODO: Make these GtkToggleButtons */ - GtkWidget *player_properties_button; struct tool_value_selector *tool_selectors[NUM_EDITOR_TOOL_TYPES]; GtkListStore *player_pov_store; -- 2.35.1