Mercurial > hg > openttd

changeset 17980:6c4dd98f3490 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22789) -Codechange: rename generation window class to modal progress
author rubidium <rubidium@openttd.org>
date Sun, 21 Aug 2011 12:49:14 +0000
parents 5302cd55d676
children 229a21b21d27
files src/genworld.cpp src/genworld_gui.cpp src/window_type.h
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -83,7 +83,7 @@
 	_gw.abortp   = NULL;
 	_gw.threaded = false;
 
-	DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
+	DeleteWindowById(WC_MODAL_PROGRESS, 0);
 	MarkWholeScreenDirty();
 }
 
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -1216,7 +1216,7 @@
 
 static const WindowDesc _generate_progress_desc(
 	WDP_CENTER, 0, 0,
-	WC_GENERATE_PROGRESS_WINDOW, WC_NONE,
+	WC_MODAL_PROGRESS, WC_NONE,
 	WDF_UNCLICK_BUTTONS,
 	_nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets)
 );
@@ -1339,7 +1339,7 @@
  */
 void ShowGenerateWorldProgress()
 {
-	if (BringWindowToFrontById(WC_GENERATE_PROGRESS_WINDOW, 0)) return;
+	if (BringWindowToFrontById(WC_MODAL_PROGRESS, 0)) return;
 	new GenerateProgressWindow();
 }
 
@@ -1390,7 +1390,7 @@
 		return;
 	}
 
-	SetWindowDirty(WC_GENERATE_PROGRESS_WINDOW, 0);
+	SetWindowDirty(WC_MODAL_PROGRESS, 0);
 	MarkWholeScreenDirty();
 
 	/* Release the rights to the map generator, and acquire the rights to the
--- a/src/window_type.h
+++ b/src/window_type.h
@@ -93,7 +93,7 @@
 	WC_ENDSCREEN,
 	WC_SIGN_LIST,
 	WC_GENERATE_LANDSCAPE,
-	WC_GENERATE_PROGRESS_WINDOW,
+	WC_MODAL_PROGRESS,
 	WC_CONFIRM_POPUP_QUERY,
 	WC_TRANSPARENCY_TOOLBAR,
 	WC_VEHICLE_TIMETABLE,