From 99dd72331c152c07ec3aba5139f9c4c2e9b94a0e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 18 Oct 2013 22:07:28 +0300
Subject: move virtual member calls from setup constuctor into postInit.
---
src/client.cpp | 1 +
src/gui/windows/setup.cpp | 3 +++
src/gui/windows/setup.h | 2 ++
3 files changed, 6 insertions(+)
diff --git a/src/client.cpp b/src/client.cpp
index 4a22836c9..373c9b13f 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -669,6 +669,7 @@ void Client::gameInit()
userPalette = new UserPalette;
setupWindow = new Setup;
+ setupWindow->postInit();
helpWindow = new HelpWindow;
didYouKnowWindow = new DidYouKnowWindow;
didYouKnowWindow->postInit();
diff --git a/src/gui/windows/setup.cpp b/src/gui/windows/setup.cpp
index a7102204c..c893b97ee 100644
--- a/src/gui/windows/setup.cpp
+++ b/src/gui/windows/setup.cpp
@@ -67,7 +67,10 @@ Setup::Setup() :
setCloseButton(true);
setResizable(true);
setStickyButtonLock(true);
+}
+void Setup::postInit()
+{
int width = 620;
const int height = 450;
diff --git a/src/gui/windows/setup.h b/src/gui/windows/setup.h
index 5b299511b..e230dfe22 100644
--- a/src/gui/windows/setup.h
+++ b/src/gui/windows/setup.h
@@ -49,6 +49,8 @@ class Setup final : public Window, public gcn::ActionListener
~Setup();
+ void postInit();
+
void action(const gcn::ActionEvent &event) override;
void setInGame(const bool inGame);
--
cgit v1.2.3-70-g09d2