diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-05 07:39:43 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-05 07:58:02 -0700 |
| commit | 78ab7c7a2877efd245293ad00cd36bcaa8646507 (patch) | |
| tree | 28ea749d784a3dbee334f6a076a7ac77bc0333e1 /src/gui/gui.cpp | |
| parent | b60e6d82d6e843f9e65c81555ec281d237c3ce41 (diff) | |
| download | Mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.gz Mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.bz2 Mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.tar.xz Mana-78ab7c7a2877efd245293ad00cd36bcaa8646507.zip | |
Rename SkinLoader to Theme
Also merge the guialpha ConfigListener into Theme.
Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 1e36523c..a59b0157 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -24,7 +24,7 @@ #include "gui/focushandler.h" #include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/skin.h" +#include "gui/theme.h" #include "gui/truetypefont.h" #include "gui/widgets/window.h" @@ -154,7 +154,7 @@ Gui::~Gui() delete guiInput; - SkinLoader::deleteInstance(); + Theme::deleteInstance(); } void Gui::logic() @@ -209,8 +209,7 @@ void Gui::setUseCustomCursor(bool customCursor) SDL_ShowCursor(SDL_DISABLE); // Load the mouse cursor - mMouseCursors = SkinLoader::getImageSetFromTheme("mouse.png", - 40, 40); + mMouseCursors = Theme::getImageSetFromTheme("mouse.png", 40, 40); if (!mMouseCursors) logger->error("Unable to load mouse cursors."); |