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/widgets/popup.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/widgets/popup.cpp')
| -rw-r--r-- | src/gui/widgets/popup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 7d73e749..41d60ab6 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -50,7 +50,7 @@ Popup::Popup(const std::string &name, const std::string &skin): setPadding(3); // Loads the skin - mSkin = skinLoader->load(skin, mDefaultSkinPath); + mSkin = SkinLoader::instance()->load(skin, mDefaultSkinPath); // Add this window to the window container windowContainer->add(this); @@ -85,7 +85,7 @@ void Popup::loadPopupConfiguration() if (skinName.compare(mSkin->getFilePath()) != 0) { mSkin->instances--; - mSkin = skinLoader->load(skinName, mDefaultSkinPath); + mSkin = SkinLoader::instance()->load(skinName, mDefaultSkinPath); } } |