summaryrefslogtreecommitdiff
path: root/src/gui/widgets/popup.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 23:56:04 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-20 13:55:42 +0300
commitd59cd9111c1e86b224ea62cc975c49b157e2b3cf (patch)
treed7186479633c0269573e92b5a5213d04b84b3995 /src/gui/widgets/popup.cpp
parent71d2b482d84246b8456ea863f94a9a766d33f197 (diff)
downloadmv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.gz
mv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.bz2
mv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.xz
mv-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.zip
Add to some controls palette inheritance from other controls.
Diffstat (limited to 'src/gui/widgets/popup.cpp')
-rw-r--r--src/gui/widgets/popup.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index eb3bcd64b..cd50bfe1b 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -36,8 +36,9 @@
#include "debug.h"
-Popup::Popup(const std::string &name, std::string skin) :
- Container(),
+Popup::Popup(const std::string &name,
+ std::string skin) :
+ Container(nullptr),
gcn::MouseListener(),
gcn::WidgetListener(),
mPopupName(name),
@@ -65,7 +66,10 @@ Popup::Popup(const std::string &name, std::string skin) :
{
mSkin = Theme::instance()->load(skin, "popup.xml");
if (mSkin)
+ {
setPadding(mSkin->getPadding());
+ // init Widget2 fields
+ }
}
else
{