Fixed - #2921: Window should be able to contain a ComponentContainer

http://dev.itmill.com/ticket/2921

svn changeset:7713/svn branch:6.0

1 files changed, 5 insertions, 10 deletions

diff --git a/src/com/itmill/toolkit/ui/Window.java b/src/com/itmill/toolkit/ui/Window.java
index 9dac2c2c2a..1818054947 100644
--- a/src/com/itmill/toolkit/ui/Window.java
+++ b/src/com/itmill/toolkit/ui/Window.java
@@ -174,17 +174,12 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * @param layout
      *            the Layout of the window.
      */
-    public Window(String caption, Layout layout) {
-        super(caption, layout);
+    public Window(String caption, ComponentContainer content) {
+        super(caption, content);
         setScrollable(true);
         setSizeUndefined();
     }
 
-    @Override
-    public void setLayout(Layout newLayout) {
-        super.setLayout(newLayout);
-    }
-
     /**
      * Gets the terminal type.
      * 
@@ -510,11 +505,11 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
             target.addAttribute("main", true);
         }
 
-        if (getLayout() != null) {
-            if (getLayout().getHeightUnits() == Sizeable.UNITS_PERCENTAGE) {
+        if (getContent() != null) {
+            if (getContent().getHeightUnits() == Sizeable.UNITS_PERCENTAGE) {
                 target.addAttribute("layoutRelativeHeight", true);
             }
-            if (getLayout().getWidthUnits() == Sizeable.UNITS_PERCENTAGE) {
+            if (getContent().getWidthUnits() == Sizeable.UNITS_PERCENTAGE) {
                 target.addAttribute("layoutRelativeWidth", true);
             }
         }