summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-19 12:50:59 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:22 +0300
commite4d34f9e3f5b2068be1a8137c75a571e9da42cda (patch)
tree97d0e13dd2f163e9ce91576b29eec8563899097c /src/gui/windows
parentecc414fed44c8b0ee63c0acf188a109e3867a815 (diff)
downloadmanaplus-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.tar.gz
manaplus-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.tar.bz2
manaplus-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.tar.xz
manaplus-e4d34f9e3f5b2068be1a8137c75a571e9da42cda.zip
move virtual member calls from textpopup constructor into postInit.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/inventorywindow.cpp2
-rw-r--r--src/gui/windows/minimap.cpp2
-rw-r--r--src/gui/windows/ministatuswindow.cpp2
-rw-r--r--src/gui/windows/skilldialog.cpp2
4 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 4be320617..bc803d0d3 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -130,6 +130,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
mSplit(false),
mCompactMode(false)
{
+ mTextPopup->postInit();
+
if (inventory)
{
setCaption(gettext(inventory->getName().c_str()));
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index a02e02f5d..d268addf6 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -58,6 +58,8 @@ Minimap::Minimap() :
mCustomMapImage(false),
mAutoResize(config.getBoolValue("autoresizeminimaps"))
{
+ mTextPopup->postInit();
+
setWindowName("Minimap");
mShow = config.getValueBool(getWindowName() + "Show", true);
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index fe56a1f59..cc666f614 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -91,7 +91,9 @@ MiniStatusWindow::MiniStatusWindow() :
mTextPopup(new TextPopup),
mStatusPopup(new StatusPopup)
{
+ mTextPopup->postInit();
mStatusPopup->postInit();
+
listen(CHANNEL_ATTRIBUTES);
StatusWindow::updateHPBar(mHpBar);
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index e379ea425..74fb4faf5 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -70,6 +70,8 @@ class SkillListBox final : public ListBox
mRowHeight(getFont()->getHeight() * 2 + mSpacing + 2 * mPadding),
mSkillClicked(false)
{
+ mPopup->postInit();
+
if (mRowHeight < 34)
mRowHeight = 34;
}