summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-15 22:55:02 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-15 22:55:02 +0200
commitddd7f8acbbfbe7cf2787279babdb5c1279c7fd73 (patch)
treeb803ae0a601e46cfa0539f79f76c731dc28652f2 /src/gui/gui.cpp
parent2a3f16f5673e6482e422a65f6f23f958dd78955f (diff)
downloadmana-ddd7f8acbbfbe7cf2787279babdb5c1279c7fd73.tar.gz
mana-ddd7f8acbbfbe7cf2787279babdb5c1279c7fd73.tar.bz2
mana-ddd7f8acbbfbe7cf2787279babdb5c1279c7fd73.tar.xz
mana-ddd7f8acbbfbe7cf2787279babdb5c1279c7fd73.zip
Made the PopupMenu a Popup subclass
It's a natural better fit. The SkinLoader was changed into a singleton, since it's used by both Window and Popup classes.
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 8a4e4aec..f1bb1022 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -161,6 +161,8 @@ Gui::~Gui()
delete getTop();
delete guiInput;
+
+ SkinLoader::deleteInstance();
}
void Gui::logic()