Revert "Merge WindowContainer into Viewport and remove extra members"

This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.

Conflicts:

	src/gui/gui.cpp
	src/gui/viewport.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 3c458efe..b72be9d4 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -34,6 +34,7 @@ class Layout;
 class LayoutCell;
 class ResizeGrip;
 class Skin;
+class WindowContainer;
 
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
@@ -64,6 +65,11 @@ class Window : public gcn::Window, gcn::WidgetListener
         ~Window();
 
         /**
+         * Sets the window container to be used by new windows.
+         */
+        static void setWindowContainer(WindowContainer *windowContainer);
+
+        /**
          * Draws the window.
          */
         void draw(gcn::Graphics *graphics);