summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-18 11:59:13 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:19 +0300
commit8319916c8521b2611d8b877167c3fb612c22b37d (patch)
tree2aab059780cc395951e0e733a10e1ecbe3dd0552
parent3e09a2b6fcfef5582eff798f2c4299f706dbd5e7 (diff)
downloadplus-8319916c8521b2611d8b877167c3fb612c22b37d.tar.gz
plus-8319916c8521b2611d8b877167c3fb612c22b37d.tar.bz2
plus-8319916c8521b2611d8b877167c3fb612c22b37d.tar.xz
plus-8319916c8521b2611d8b877167c3fb612c22b37d.zip
move virtual member calls from emotewindow constuctor into postInit.
-rw-r--r--src/game.cpp1
-rw-r--r--src/gui/windows/emotewindow.cpp4
-rw-r--r--src/gui/windows/emotewindow.h2
3 files changed, 7 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 61fa1dddf..7b65147e4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -206,6 +206,7 @@ static void createGuiWindows()
// Create dialogs
emoteWindow = new EmoteWindow;
+ emoteWindow->postInit();
chatWindow = new ChatWindow;
chatWindow->postInit();
tradeWindow = new TradeWindow;
diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index cdff2d31d..405aff746 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -61,6 +61,10 @@ EmoteWindow::EmoteWindow() :
setResizable(true);
addMouseListener(this);
+}
+
+void EmoteWindow::postInit()
+{
const int pad2 = mPadding * 2;
const int width = 200;
const int height = 150;
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h
index 44a401a88..43f1a4679 100644
--- a/src/gui/windows/emotewindow.h
+++ b/src/gui/windows/emotewindow.h
@@ -41,6 +41,8 @@ class EmoteWindow final : public Window
~EmoteWindow();
+ void postInit() override;
+
void show();
void hide();