From 974eff0d1607d9f2648ecd9fbb3abfd53aa6bec4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Aug 2014 15:08:45 +0300 Subject: Create public variable for itempopup. --- src/gui/popups/itempopup.cpp | 2 ++ src/gui/popups/itempopup.h | 2 ++ src/gui/windowmanager.cpp | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 36f971849..797520c7b 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -45,6 +45,8 @@ extern int serverVersion; +ItemPopup *itemPopup = nullptr; + ItemPopup::ItemPopup() : Popup("ItemPopup", "itempopup.xml"), mItemName(new Label(this)), diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index aa40181f4..05b024c57 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -78,4 +78,6 @@ class ItemPopup final : public Popup void setLabelColor(Label *label, const ItemType::Type type) const; }; +extern ItemPopup *itemPopup; + #endif // GUI_POPUPS_ITEMPOPUP_H diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index d96d632f0..9b359f12a 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -33,6 +33,7 @@ #include "gui/userpalette.h" #include "gui/popups/beingpopup.h" +#include "gui/popups/itempopup.h" #include "gui/popups/popupmenu.h" #include "gui/popups/textpopup.h" @@ -103,12 +104,15 @@ void WindowManager::createWindows() beingPopup->postInit(); textPopup = new TextPopup; textPopup->postInit(); + itemPopup = new ItemPopup; + itemPopup->postInit(); } void WindowManager::deleteWindows() { delete2(textPopup); delete2(beingPopup); + delete2(itemPopup); delete2(popupMenu); delete2(commandHandler); delete2(didYouKnowWindow); -- cgit v1.2.3-60-g2f50