diff options
author | Ira Rice <irarice@gmail.com> | 2009-03-26 19:50:12 -0600 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-03-26 19:50:12 -0600 |
commit | 2aab736bc5d77ffda789d7de56cef100fac207e1 (patch) | |
tree | b74924b5f590e5b144aca58563b96d67fbd9fd05 /src/gui/popup.cpp | |
parent | 5561f4355ae1b1c167cd19575527ae0eae24e029 (diff) | |
download | mana-2aab736bc5d77ffda789d7de56cef100fac207e1.tar.gz mana-2aab736bc5d77ffda789d7de56cef100fac207e1.tar.bz2 mana-2aab736bc5d77ffda789d7de56cef100fac207e1.tar.xz mana-2aab736bc5d77ffda789d7de56cef100fac207e1.zip |
Removed setting and getting parent windows for popup classes, as this
wasn't really useful or used at all. Also removed some unneeded includes
in the popup class.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui/popup.cpp')
-rw-r--r-- | src/gui/popup.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/popup.cpp b/src/gui/popup.cpp index a27b1d90..f4c7d4a3 100644 --- a/src/gui/popup.cpp +++ b/src/gui/popup.cpp @@ -22,19 +22,16 @@ #include <guichan/exception.hpp> -#include "gui.h" #include "skin.h" #include "popup.h" #include "windowcontainer.h" -#include "../configlistener.h" #include "../configuration.h" +#include "../graphics.h" #include "../log.h" #include "../resources/image.h" -int Popup::instances = 0; - Popup::Popup(const std::string& name, const std::string& skin): mPopupName(name), mDefaultSkinPath(skin), @@ -50,8 +47,6 @@ Popup::Popup(const std::string& name, const std::string& skin): setPadding(3); - instances++; - // Loads the skin mSkin = skinLoader->load(skin, mDefaultSkinPath); @@ -75,8 +70,6 @@ Popup::~Popup() delete(w); } - instances--; - mSkin->instances--; } |