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.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 52665213..19621c07 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -25,7 +25,9 @@
 #include "gui.h"
 #include <guichan/allegro.hpp>
 
-Window::Window(gcn::Container *parent, const std::string& text) :
+WindowContainer *Window::windowContainer = NULL;
+
+Window::Window(const std::string& text, bool modal):
     caption(text),
     mousePX(0),
     mousePY(0),
@@ -53,8 +55,13 @@ Window::Window(gcn::Container *parent, const std::string& text) :
     chrome->setY(titlebarHeight);
     gcn::Container::add(chrome);
 
-    // Add this window to the parent container
-    parent->add(this);
+    // Add this window to the window container
+    if (windowContainer) {
+        windowContainer->add(this, modal);
+    }
+    else {
+        throw GCN_EXCEPTION("Window::Window. no windowContainer set");
+    }
 }
 
 Window::~Window()
@@ -67,6 +74,11 @@ Window::~Window()
     delete chrome;
 }
 
+void Window::setWindowContainer(WindowContainer *wc)
+{
+    windowContainer = wc;
+}
+
 void Window::draw(gcn::Graphics* graphics)
 {
     // Draw container background when opaque