Mercurial > hg > openttd

changeset 17594:386ff2bf4d4e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22358) -Codechange: WC_TOOLBAR_MENU isn't the right name when its only used for client list popups
author rubidium <rubidium@openttd.org>
date Fri, 22 Apr 2011 15:50:13 +0000
parents fc000097d463
children a2712af90020
files src/company_cmd.cpp src/network/network_gui.cpp src/window.cpp src/window_type.h
diffstat 4 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -556,7 +556,7 @@
 	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);
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1701,7 +1701,7 @@
 
 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 @@
 				this->actions[index].proc(this->client_no);
 			}
 
-			DeleteWindowById(WC_TOOLBAR_MENU, 0);
+			DeleteWindowById(WC_CLIENT_LIST_POPUP, 0);
 		}
 	}
 };
@@ -1885,7 +1885,7 @@
  */
 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;
 
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2565,7 +2565,6 @@
 				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 @@
 /** 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);
 }
--- a/src/window_type.h
+++ b/src/window_type.h
@@ -51,7 +51,7 @@
 	WC_QUERY_STRING,
 	WC_SAVELOAD,
 	WC_SELECT_GAME,
-	WC_TOOLBAR_MENU,
+	WC_CLIENT_LIST_POPUP,
 	WC_INCOME_GRAPH,
 	WC_OPERATING_PROFIT,
 	WC_TOOLTIPS,