summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-01 15:47:15 -0700
committerJared Adams <jaxad0127@gmail.com>2010-03-01 17:26:24 -0700
commit67e678094b9fddd21fb3c690130e772937ab2746 (patch)
tree75b2ee140dcdc1e5be24f47f38ec724a47df7103 /src/gui/gui.cpp
parent3acb148b6d5fe3b342e4397e2c7de020de6005ff (diff)
downloadmana-client-67e678094b9fddd21fb3c690130e772937ab2746.tar.gz
mana-client-67e678094b9fddd21fb3c690130e772937ab2746.tar.bz2
mana-client-67e678094b9fddd21fb3c690130e772937ab2746.tar.xz
mana-client-67e678094b9fddd21fb3c690130e772937ab2746.zip
Merge WindowContainer into Viewport and remove extra members
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index bc3eb675..2a6e1ce3 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -29,7 +29,6 @@
#include "gui/viewport.h"
#include "gui/widgets/window.h"
-#include "gui/widgets/windowcontainer.h"
#include "configlistener.h"
#include "configuration.h"
@@ -94,11 +93,11 @@ Gui::Gui(Graphics *graphics):
mFocusHandler = new FocusHandler;
// Initialize top GUI widget
- WindowContainer *guiTop = new WindowContainer;
+ Viewport *guiTop = new Viewport;
+ guiTop->setFocusable(true);
guiTop->setDimension(gcn::Rectangle(0, 0,
graphics->getWidth(), graphics->getHeight()));
guiTop->setOpaque(false);
- Window::setWindowContainer(guiTop);
setTop(guiTop);
ResourceManager *resman = ResourceManager::getInstance();