diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:38:18 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:38:18 +0100 |
| commit | 1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9 (patch) | |
| tree | 596305e9bfd4ad8448efd477a43f86490b1974c5 /src/gui/gui.cpp | |
| parent | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (diff) | |
| parent | f5f7a7d5990d1133f714b6cd431aecf6a332fbd5 (diff) | |
| download | mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.gz mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.bz2 mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.tar.xz mana-1e52781e7d425cffcc6a5319b4cb5bf5eebe2ea9.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 e82a33b9..1e36523c 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -26,7 +26,6 @@ #include "gui/sdlinput.h" #include "gui/skin.h" #include "gui/truetypefont.h" -#include "gui/viewport.h" #include "gui/widgets/window.h" #include "gui/widgets/windowcontainer.h" @@ -95,6 +94,7 @@ Gui::Gui(Graphics *graphics): // Initialize top GUI widget WindowContainer *guiTop = new WindowContainer; + guiTop->setFocusable(true); guiTop->setDimension(gcn::Rectangle(0, 0, graphics->getWidth(), graphics->getHeight())); guiTop->setOpaque(false); @@ -209,9 +209,8 @@ void Gui::setUseCustomCursor(bool customCursor) SDL_ShowCursor(SDL_DISABLE); // Load the mouse cursor - ResourceManager *resman = ResourceManager::getInstance(); - mMouseCursors = - resman->getImageSet("graphics/gui/mouse.png", 40, 40); + mMouseCursors = SkinLoader::getImageSetFromTheme("mouse.png", + 40, 40); if (!mMouseCursors) logger->error("Unable to load mouse cursors."); |