diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-15 22:55:02 +0200 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-15 22:55:02 +0200 |
commit | ddd7f8acbbfbe7cf2787279babdb5c1279c7fd73 (patch) | |
tree | b803ae0a601e46cfa0539f79f76c731dc28652f2 /src/gui/popupmenu.cpp | |
parent | 2a3f16f5673e6482e422a65f6f23f958dd78955f (diff) | |
download | mana-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.cpp')
-rw-r--r-- | src/gui/popupmenu.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index a78e620d..d3298961 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -50,24 +50,17 @@ extern std::string tradePartnerName; PopupMenu::PopupMenu(): - Window("PopupMenu"), + Popup("PopupMenu"), mBeingId(0), mFloorItem(NULL), mItem(NULL) { - setDefaultSize(0, 0, 0, 0); - setResizable(false); - setTitleBarHeight(0); - setShowTitle(false); - mBrowserBox = new BrowserBox; mBrowserBox->setPosition(4, 4); mBrowserBox->setHighlightMode(BrowserBox::BACKGROUND); mBrowserBox->setOpaque(false); mBrowserBox->setLinkHandler(this); add(mBrowserBox); - - loadWindowState(); } void PopupMenu::showPopup(int x, int y, Being *being) |