From 8319916c8521b2611d8b877167c3fb612c22b37d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 18 Oct 2013 11:59:13 +0300 Subject: move virtual member calls from emotewindow constuctor into postInit. --- src/game.cpp | 1 + src/gui/windows/emotewindow.cpp | 4 ++++ src/gui/windows/emotewindow.h | 2 ++ 3 files changed, 7 insertions(+) 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(); -- cgit v1.2.3-60-g2f50