summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-23 18:41:27 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-23 18:41:27 +0300
commit2443f62e578283b20aaed1874fb356753774cf79 (patch)
tree01dd92a02a60a814710708af2155d4ead9386ce1
parentc44828b14dce7e00ca01791eecf2bc452ee4cb00 (diff)
downloadmv-2443f62e578283b20aaed1874fb356753774cf79.tar.gz
mv-2443f62e578283b20aaed1874fb356753774cf79.tar.bz2
mv-2443f62e578283b20aaed1874fb356753774cf79.tar.xz
mv-2443f62e578283b20aaed1874fb356753774cf79.zip
Add check in popups for posInit() calls.
If postInit() was not called show error in log.
-rw-r--r--src/gui/widgets/popup.cpp9
-rw-r--r--src/gui/widgets/popup.h7
2 files changed, 11 insertions, 5 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index a2c441225..a69c7a654 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -44,11 +44,12 @@ Popup::Popup(const std::string &name,
mPadding(3),
mSkin(nullptr),
mPopupName(name),
+ mVertexes(new ImageCollection),
mMinWidth(100),
mMinHeight(40),
mMaxWidth(mainGraphics->mWidth),
mMaxHeight(mainGraphics->mHeight),
- mVertexes(new ImageCollection)
+ mInit(false)
{
logger->log("Popup::Popup(\"%s\")", name.c_str());
@@ -86,6 +87,12 @@ Popup::~Popup()
theme->unload(mSkin);
mSkin = nullptr;
}
+
+ if (!mInit)
+ {
+ logger->log("error: Popup created without calling postInit(): "
+ + mPopupName);
+ }
}
void Popup::setWindowContainer(WindowContainer *const wc)
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index a375a90c7..f39a92ec0 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -172,8 +172,7 @@ class Popup notfinal : public Container,
{ return mVisible; }
virtual void postInit()
- {
- }
+ { mInit = true; }
protected:
int mPadding; /**< Holds the padding of the popup. */
@@ -181,12 +180,12 @@ class Popup notfinal : public Container,
private:
std::string mPopupName; /**< Name of the popup */
+ ImageCollection *mVertexes;
int mMinWidth; /**< Minimum popup width */
int mMinHeight; /**< Minimum popup height */
int mMaxWidth; /**< Maximum popup width */
int mMaxHeight; /**< Maximum popup height */
-
- ImageCollection *mVertexes;
+ bool mInit;
};
#endif // GUI_WIDGETS_POPUP_H