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>

2 files changed, 1 insertions, 11 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--;
 }
 
diff --git a/src/gui/popup.h b/src/gui/popup.h
index 58ccd16e..c68c2098 100644
--- a/src/gui/popup.h
+++ b/src/gui/popup.h
@@ -25,7 +25,6 @@
 
 #include <guichan/widgets/container.hpp>
 
-#include "../graphics.h"
 #include "../guichanfwd.h"
 
 class Skin;
@@ -180,8 +179,6 @@ class Popup : public gcn::Container
         int mMaxHeight;               /**< Maximum popup height */
         int mPadding;                 /**< Holds the padding of the popup. */
 
-        static int instances;         /**< Number of popup instances */
-
         Skin* mSkin;                  /**< Skin in use by this popup */
 };