summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-08 01:33:53 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-08 01:33:53 +0000
commitee416a5f3de03a689247a290077e7fdf451e1a23 (patch)
treef456df99f954919ac7a425606df51f010aa4ef2d /src/gui/gui.cpp
parent4070dda1560bc729c3e272f0a5c03d77391e2661 (diff)
downloadmana-client-ee416a5f3de03a689247a290077e7fdf451e1a23.tar.gz
mana-client-ee416a5f3de03a689247a290077e7fdf451e1a23.tar.bz2
mana-client-ee416a5f3de03a689247a290077e7fdf451e1a23.tar.xz
mana-client-ee416a5f3de03a689247a290077e7fdf451e1a23.zip
Well improved window container and window widgets a bit, and made a start
on support for modal dialogs. Still some issues to work out. Tell me if you experience something unsettling.
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 5cd475af..dac21c00 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -28,6 +28,7 @@
#include "../log.h"
#include "../sound/sound.h"
#include "allegroinput.h"
+#include "window.h"
#include "windowcontainer.h"
#define GUI_BMP_COUNT 11
@@ -49,9 +50,9 @@ DATAFILE *gui_gfx;
// Guichan stuff
-Gui* gui;
-gcn::AllegroGraphics* guiGraphics; // Graphics driver
-gcn::Container* guiTop; // The top container
+Gui *gui;
+gcn::AllegroGraphics *guiGraphics; // Graphics driver
+WindowContainer *guiTop; // The top container
Gui::Gui(BITMAP *screen)
@@ -71,6 +72,7 @@ Gui::Gui(BITMAP *screen)
guiTop = new WindowContainer();
guiTop->setDimension(gcn::Rectangle(0, 0, SCREEN_W, SCREEN_H));
guiTop->setOpaque(false);
+ Window::setWindowContainer(guiTop);
// Create focus handler
focusHandler = new gcn::FocusHandler();