diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
| commit | da77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch) | |
| tree | 7160c19d185fa8d0bf826c09c9346cdc8354e50d /src/gui/gui.cpp | |
| parent | f0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff) | |
| parent | 3a447afa534573ed4a014372c687ef4028d16760 (diff) | |
| download | mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.gz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.bz2 mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.xz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.zip | |
Merge branch 'master' of gitorious.org:mana/mana
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."); |