From 835ae31f450d8faf5cc6cc77678e8512c21ba906 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Fri, 22 Apr 2011 15:50:13 +0000
Subject: [PATCH] (svn r22358) -Codechange: WC_TOOLBAR_MENU isn't the right
 name when its only used for client list popups

---
 src/company_cmd.cpp         | 2 +-
 src/network/network_gui.cpp | 6 +++---
 src/window.cpp              | 2 --
 src/window_type.h           | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index c4f6611707..4ccb9ae033 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -556,7 +556,7 @@ Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY)
 	GeneratePresidentName(c);
 
 	SetWindowDirty(WC_GRAPH_LEGEND, 0);
-	SetWindowDirty(WC_TOOLBAR_MENU, 0);
+	SetWindowDirty(WC_CLIENT_LIST_POPUP, 0);
 	SetWindowDirty(WC_CLIENT_LIST, 0);
 	BuildOwnerLegend();
 	InvalidateWindowData(WC_SMALLMAP, 0, 1);
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 1d8460d6ad..802f81ab23 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1701,7 +1701,7 @@ static const NWidgetPart _nested_client_list_popup_widgets[] = {
 
 static const WindowDesc _client_list_popup_desc(
 	WDP_AUTO, 0, 0,
-	WC_TOOLBAR_MENU, WC_CLIENT_LIST,
+	WC_CLIENT_LIST_POPUP, WC_CLIENT_LIST,
 	0,
 	_nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets)
 );
@@ -1875,7 +1875,7 @@ struct NetworkClientListPopupWindow : Window {
 				this->actions[index].proc(this->client_no);
 			}
 
-			DeleteWindowById(WC_TOOLBAR_MENU, 0);
+			DeleteWindowById(WC_CLIENT_LIST_POPUP, 0);
 		}
 	}
 };
@@ -1885,7 +1885,7 @@ struct NetworkClientListPopupWindow : Window {
  */
 static void PopupClientList(int client_no, int x, int y)
 {
-	DeleteWindowById(WC_TOOLBAR_MENU, 0);
+	DeleteWindowById(WC_CLIENT_LIST_POPUP, 0);
 
 	if (NetworkFindClientInfo(client_no) == NULL) return;
 
diff --git a/src/window.cpp b/src/window.cpp
index b45e844435..b167cbb787 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2565,7 +2565,6 @@ restart_search:
 				w->window_class != WC_SELECT_GAME &&
 				w->window_class != WC_MAIN_TOOLBAR &&
 				w->window_class != WC_STATUS_BAR &&
-				w->window_class != WC_TOOLBAR_MENU &&
 				w->window_class != WC_TOOLTIPS &&
 				(w->flags4 & WF_STICKY) == 0) { // do not delete windows which are 'pinned'
 
@@ -2626,7 +2625,6 @@ restart_search:
 /** Delete all always on-top windows to get an empty screen */
 void HideVitalWindows()
 {
-	DeleteWindowById(WC_TOOLBAR_MENU, 0);
 	DeleteWindowById(WC_MAIN_TOOLBAR, 0);
 	DeleteWindowById(WC_STATUS_BAR, 0);
 }
diff --git a/src/window_type.h b/src/window_type.h
index 458ba70ae4..b456b9f4bc 100644
--- a/src/window_type.h
+++ b/src/window_type.h
@@ -51,7 +51,7 @@ enum WindowClass {
 	WC_QUERY_STRING,
 	WC_SAVELOAD,
 	WC_SELECT_GAME,
-	WC_TOOLBAR_MENU,
+	WC_CLIENT_LIST_POPUP,
 	WC_INCOME_GRAPH,
 	WC_OPERATING_PROFIT,
 	WC_TOOLTIPS,