--- a/UIBuilder.st	Mon Mar 03 20:31:24 1997 +0100
+++ b/UIBuilder.st	Mon Mar 03 22:28:21 1997 +0100
@@ -104,7 +104,7 @@
                 spec component:aSpec.
 
                 window isNil ifTrue:[
-                    window := View new.
+                    window := windowView := View new.
                 ].
                 aSpec buildViewWithLayoutFor:self in:window.
 "/ builder window displayBox
@@ -116,7 +116,7 @@
                     spec component collection:OrderedCollection new.
                     composite := spec component.
                     window isNil ifTrue:[
-                        window := View new.
+                        window := windowView := View new.
                     ].
                     compositeView := window.
                 ].
@@ -129,7 +129,7 @@
     lastComponent := view.
     ^ view
 
-    "Modified: 3.3.1997 / 19:49:16 / cg"
+    "Modified: 3.3.1997 / 22:03:02 / cg"
 !
 
 buildFromSpec:aSpecOrSpecArray
@@ -190,9 +190,16 @@
 
 endCompositeLayout:layout
     composite compositeSpec:(CompositeSpec new layout:layout).
+    compositeView layout:layout.
     self endComposite
 
-    "Modified: 3.3.1997 / 17:18:23 / cg"
+    "Modified: 3.3.1997 / 20:54:35 / cg"
+!
+
+endCompositeLayout:layout properties:props
+    self endCompositeLayout:layout
+
+    "Created: 3.3.1997 / 22:15:17 / cg"
 !
 
 newComposite
@@ -219,9 +226,39 @@
     "Modified: 3.3.1997 / 18:44:12 / cg"
 ! !
 
+!UIBuilder methodsFor:'initialization'!
+
+setupWindowFor:aView
+    |ext|
+
+    window notNil ifTrue:[
+        ext := window extent.
+
+        ((window isMemberOf:View)
+        or:[window isMemberOf:SimpleView]) ifTrue:[
+windowView ~~ window ifTrue:[
+    windowView isNil ifTrue:[
+        self halt
+    ]
+].
+            aView addSubView:window.
+        ].
+    ].
+
+    window := aView.
+
+    aView container isNil ifTrue:[
+        spec notNil ifTrue:[
+            spec window setupView:window for:self
+        ]
+    ].
+
+    "Modified: 3.3.1997 / 22:05:37 / cg"
+! !
+
 !UIBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/UIBuilder.st,v 1.21 1997-03-03 19:31:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/UIBuilder.st,v 1.22 1997-03-03 21:28:21 cg Exp $'
 ! !
 UIBuilder initialize!