summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.h
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/popupmenu.h
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/popupmenu.h')
-rw-r--r--src/gui/popupmenu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 338f9044..1caa00af 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -23,7 +23,7 @@
#define POPUP_MENU_H
#include "gui/linkhandler.h"
-#include "gui/widgets/window.h"
+#include "gui/widgets/popup.h"
class Being;
class BrowserBox;
@@ -33,7 +33,7 @@ class Item;
/**
* Window showing popup menu.
*/
-class PopupMenu : public Window, public LinkHandler
+class PopupMenu : public Popup, public LinkHandler
{
public:
/**