dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.

Browse Source
This commit is contained in:
frosch
2013-05-26 19:23:42 +00:00
parent 5e7603154d
commit 25adefca23
61 changed files with 488 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/genworld_gui.cpp
View File

@@ -311,9 +311,9 @@ struct GenerateLandscapeWindow : public Window {
GenenerateLandscapeWindowMode mode;
QueryString seed_editbox;
GenerateLandscapeWindow(const WindowDesc *desc, WindowNumber number = 0) : seed_editbox(11)
GenerateLandscapeWindow(WindowDesc *desc, WindowNumber number = 0) : Window(desc), seed_editbox(11)
{
this->InitNested(desc, number);
this->InitNested(number);
this->LowerWidget(_settings_newgame.game_creation.landscape + WID_GL_TEMPERATE);
@@ -796,14 +796,14 @@ struct GenerateLandscapeWindow : public Window {
}
};
static const WindowDesc _generate_landscape_desc(
static WindowDesc _generate_landscape_desc(
WDP_CENTER, 0, 0,
WC_GENERATE_LANDSCAPE, WC_NONE,
0,
_nested_generate_landscape_widgets, lengthof(_nested_generate_landscape_widgets)
);
static const WindowDesc _heightmap_load_desc(
static WindowDesc _heightmap_load_desc(
WDP_CENTER, 0, 0,
WC_GENERATE_LANDSCAPE, WC_NONE,
0,
@@ -870,9 +870,9 @@ struct CreateScenarioWindow : public Window
{
uint widget_id;
CreateScenarioWindow(const WindowDesc *desc, WindowNumber window_number) : Window()
CreateScenarioWindow(WindowDesc *desc, WindowNumber window_number) : Window(desc)
{
this->InitNested(desc, window_number);
this->InitNested(window_number);
this->LowerWidget(_settings_newgame.game_creation.landscape + WID_CS_TEMPERATE);
}
@@ -1097,7 +1097,7 @@ static const NWidgetPart _nested_create_scenario_widgets[] = {
EndContainer(),
};
static const WindowDesc _create_scenario_desc(
static WindowDesc _create_scenario_desc(
WDP_CENTER, 0, 0,
WC_GENERATE_LANDSCAPE, WC_NONE,
0,
@@ -1125,7 +1125,7 @@ static const NWidgetPart _nested_generate_progress_widgets[] = {
};
static const WindowDesc _generate_progress_desc(
static WindowDesc _generate_progress_desc(
WDP_CENTER, 0, 0,
WC_MODAL_PROGRESS, WC_NONE,
0,
@@ -1170,9 +1170,9 @@ static void AbortGeneratingWorldCallback(Window *w, bool confirmed)
struct GenerateProgressWindow : public Window {
GenerateProgressWindow() : Window()
GenerateProgressWindow() : Window(&_generate_progress_desc)
{
this->InitNested(&_generate_progress_desc);
this->InitNested();
}
virtual void OnClick(Point pt, int widget, int click_count)