From e99aec39ef3a4c5f92cbfe6f40442499c836731e Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 21 Aug 2011 12:49:14 +0000 Subject: (svn r22789) -Codechange: rename generation window class to modal progress --- src/genworld.cpp | 2 +- src/genworld_gui.cpp | 6 +++--- src/window_type.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/genworld.cpp b/src/genworld.cpp index d4f2746fb..151abc2b9 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -83,7 +83,7 @@ static void CleanupGeneration() _gw.abortp = NULL; _gw.threaded = false; - DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0); + DeleteWindowById(WC_MODAL_PROGRESS, 0); MarkWholeScreenDirty(); } diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index 907b91d22..f08d32094 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -1216,7 +1216,7 @@ static const NWidgetPart _nested_generate_progress_widgets[] = { 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 PrepareGenerateWorldProgress() */ void ShowGenerateWorldProgress() { - if (BringWindowToFrontById(WC_GENERATE_PROGRESS_WINDOW, 0)) return; + if (BringWindowToFrontById(WC_MODAL_PROGRESS, 0)) return; new GenerateProgressWindow(); } @@ -1390,7 +1390,7 @@ static void _SetGeneratingWorldProgress(GenWorldProgress cls, uint progress, uin 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 diff --git a/src/window_type.h b/src/window_type.h index d6ac42d0d..00af022da 100644 --- a/src/window_type.h +++ b/src/window_type.h @@ -93,7 +93,7 @@ enum WindowClass { 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, -- cgit v1.2.3-54-g00ecf