cpp/openttd-patchpack/source Changeset - r17584:7592b2c83ed3

Changeset - r17584:7592b2c83ed3

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 13 years ago 2011-04-22 15:50:13
rubidium@openttd.org

(svn r22358) -Codechange: WC_TOOLBAR_MENU isn't the right name when its only used for client list popups

4 files changed with 5 insertions and 7 deletions:

src/company_cmd.cpp

src/network/network_gui.cpp

src/window.cpp

src/window_type.h

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -556,7 +556,7 @@ Company *DoStartupNewCompany(bool is_ai, @@
 	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);

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -1701,7 +1701,7 @@ static const NWidgetPart _nested_client_ @@
 static const WindowDesc _client_list_popup_desc(
 	WDP_AUTO, 0, 0,
-	WC_TOOLBAR_MENU, WC_CLIENT_LIST,
+	WC_CLIENT_LIST_POPUP, WC_CLIENT_LIST,
 ,
 	_nested_client_list_popup_widgets, lengthof(_nested_client_list_popup_widgets)
 );
@@ @@ -1875,7 +1875,7 @@ struct NetworkClientListPopupWindow : Wi @@
 				this->actions[index].proc(this->client_no);
+			}
-			DeleteWindowById(WC_TOOLBAR_MENU, 0);
+			DeleteWindowById(WC_CLIENT_LIST_POPUP, 0);
+		}
+	}
 };
@@ @@ -1885,7 +1885,7 @@ struct NetworkClientListPopupWindow : Wi @@
  */
 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;

src/window.cpp

➞

Show inline comments

@@ @@ -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);
+}

src/window_type.h

➞

Show inline comments

@@ @@ -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,

0 comments (0 inline, 0 general)