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

This commit is contained in:
frosch
2013-05-26 19:23:42 +00:00
parent b10a4f151a
commit 56e4a8c4d6
61 changed files with 488 additions and 482 deletions

View File

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