summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-18 22:07:28 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:22 +0300
commit99dd72331c152c07ec3aba5139f9c4c2e9b94a0e (patch)
tree8e65b168c7803ac18b96637a9555a9092dfeaa5a /src
parent74e429575a1ace40339e3a7c73250548aec85247 (diff)
downloadplus-99dd72331c152c07ec3aba5139f9c4c2e9b94a0e.tar.gz
plus-99dd72331c152c07ec3aba5139f9c4c2e9b94a0e.tar.bz2
plus-99dd72331c152c07ec3aba5139f9c4c2e9b94a0e.tar.xz
plus-99dd72331c152c07ec3aba5139f9c4c2e9b94a0e.zip
move virtual member calls from setup constuctor into postInit.
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp1
-rw-r--r--src/gui/windows/setup.cpp3
-rw-r--r--src/gui/windows/setup.h2
3 files changed, 6 insertions, 0 deletions
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);