From d59cd9111c1e86b224ea62cc975c49b157e2b3cf Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 19 Oct 2012 23:56:04 +0300
Subject: Add to some controls palette inheritance from other controls.

---
 src/gui/widgets/popup.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/gui/widgets/popup.cpp')

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
     {
-- 
cgit v1.2.3-60-g2f50