summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-18 00:02:21 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:18 +0300
commit35e551f6a0a7836520c66f523c37a4952a3e5c34 (patch)
treea55e5587bcdb07c84e160749f5250b56e3b06b43
parentb0e9e564c2cf081e512798f157dbbaebd7b99983 (diff)
downloadmanaplus-35e551f6a0a7836520c66f523c37a4952a3e5c34.tar.gz
manaplus-35e551f6a0a7836520c66f523c37a4952a3e5c34.tar.bz2
manaplus-35e551f6a0a7836520c66f523c37a4952a3e5c34.tar.xz
manaplus-35e551f6a0a7836520c66f523c37a4952a3e5c34.zip
move virtual member calls from debugwindow constuctor into postInit.
-rw-r--r--src/game.cpp1
-rw-r--r--src/gui/windows/debugwindow.cpp6
-rw-r--r--src/gui/windows/debugwindow.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 415f71bec..61fa1dddf 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -220,6 +220,7 @@ static void createGuiWindows()
skillDialog = new SkillDialog;
minimap = new Minimap;
debugWindow = new DebugWindow;
+ debugWindow->postInit();
itemShortcutWindow = new ShortcutWindow(
"ItemShortcut", "items.xml", 83, 460);
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 24a77a402..cc9003b9a 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -73,7 +73,6 @@ DebugWindow::DebugWindow() :
mTabs->addTab(std::string(_("Net")), mNetWidget);
mTabs->setDimension(gcn::Rectangle(0, 0, 600, 300));
- add(mTabs);
const int w = mDimension.width;
const int h = mDimension.height;
@@ -94,6 +93,11 @@ DebugWindow::~DebugWindow()
mNetWidget = nullptr;
}
+void DebugWindow::postInit()
+{
+ add(mTabs);
+}
+
void DebugWindow::slowLogic()
{
BLOCK_START("DebugWindow::slowLogic")
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index cd76c7a76..35c7df651 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -138,6 +138,7 @@ class DebugWindow final : public Window
~DebugWindow();
+ void postInit();
/**
* Logic (updates components' size and infos)
*/