diff options
| author | frosch <frosch@openttd.org> | 2013-05-26 19:23:42 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2013-05-26 19:23:42 +0000 |
| commit | 56e4a8c4d63b19cb037ac1ba64c5a4d7fde4350b (patch) | |
| tree | f3e5c225182fce7a451af4e09e943920e0f1cc3c /src/toolbar_gui.cpp | |
| parent | b10a4f151aa534860dcc61ecf8cba7b3589e6281 (diff) | |
| download | openttd-56e4a8c4d63b19cb037ac1ba64c5a4d7fde4350b.tar.xz | |
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
Diffstat (limited to 'src/toolbar_gui.cpp')
| -rw-r--r-- | src/toolbar_gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index f8c6691f4..0d3bffc0d 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1552,9 +1552,9 @@ enum MainToolbarHotkeys { struct MainToolbarWindow : Window { CallBackFunction last_started_action; ///< Last started user action. - MainToolbarWindow(const WindowDesc *desc) : Window() + MainToolbarWindow(WindowDesc *desc) : Window(desc) { - this->InitNested(desc, 0); + this->InitNested(0); this->last_started_action = CBF_NONE; CLRBITS(this->flags, WF_WHITE_BORDER); @@ -1857,9 +1857,9 @@ enum MainToolbarEditorHotkeys { struct ScenarioEditorToolbarWindow : Window { CallBackFunction last_started_action; ///< Last started user action. - ScenarioEditorToolbarWindow(const WindowDesc *desc) : Window() + ScenarioEditorToolbarWindow(WindowDesc *desc) : Window(desc) { - this->InitNested(desc, 0); + this->InitNested(0); this->last_started_action = CBF_NONE; CLRBITS(this->flags, WF_WHITE_BORDER); |