diff -r 8722cfe3cce1 -r d66f0b84aa6b UIPainter.st
--- a/UIPainter.st	Sat Jan 29 13:30:18 2000 +0100
+++ b/UIPainter.st	Sat Jan 29 13:30:36 2000 +0100
@@ -12,8 +12,8 @@
 
 
 ToolApplicationModel subclass:#UIPainter
-	instanceVariableNames:'specClass specSelector specSuperclass aspects treeView specCanvas
-		selectionPanel tabSelection layoutCanvas helpCanvas modified'
+	instanceVariableNames:'specClass specSelector specSuperclass aspects treeView
+		selectionPanel tabSelection modified specTool layoutTool helpTool'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
@@ -1871,41 +1871,48 @@
 noteBookView
     "returns the notebook view; initialize the tools embedded in the notebook"
 
-    |noteBook modifiedChannel helpTool layoutTool specTool|
+    |noteBook modifiedChannel applBuilder applWindow|
 
     (noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
-        noteBook   := View new.
+        modifiedChannel := self modifiedChannel.
+        noteBook := View new.
+        builder aspectAt:#noteBookView put:noteBook.
+
         layoutTool := UILayoutTool new.
-        helpTool   := UIHelpTool   new.
-        helpTool buildFromClass:specClass.
-        specTool   := UISpecificationTool new.
-        modifiedChannel    := self modifiedChannel.
-
+        layoutTool createBuilder.
+        applBuilder := layoutTool builder.
+        applWindow  := SimpleView origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+        applWindow level:0.
         layoutTool masterApplication:self.
-        specTool   masterApplication:self.
-        helpTool   masterApplication:self.
-
-        layoutCanvas := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
-        helpCanvas   := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
-        specCanvas   := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
-
-        layoutCanvas level:0.
-        helpCanvas   level:0.
-        specCanvas   level:0.
-
-        layoutCanvas client:layoutTool.
-        helpCanvas   client:helpTool.
-        specTool builder:(specCanvas client:specTool).
-
-        layoutTool masterApplication:self.
-        specTool   masterApplication:self.
-        helpTool   masterApplication:self.
-
+        applBuilder window:applWindow.
+        applWindow client:layoutTool spec:#windowSpec builder:applBuilder.
+        applBuilder window:applWindow.
         layoutTool modifiedHolder:modifiedChannel.
-        helpTool   modifiedHolder:modifiedChannel.
-        specTool   modifiedHolder:modifiedChannel.
-
-        builder aspectAt:#noteBookView put:noteBook.
+
+        helpTool := UIHelpTool new.
+        helpTool createBuilder.
+        applBuilder := helpTool builder.
+        applWindow  := SimpleView origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+        applWindow level:0.
+        helpTool buildFromClass:specClass.
+        helpTool masterApplication:self.
+        applBuilder window:applWindow.
+        applWindow client:helpTool spec:#windowSpec builder:applBuilder.
+        applBuilder window:applWindow.
+        helpTool modifiedHolder:modifiedChannel.
+
+        specTool := UISpecificationTool new.
+        specTool createBuilder.
+        applBuilder := specTool builder.
+        applWindow  := SimpleView origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+        specTool masterApplication:self.
+        applWindow level:0.
+
+        applBuilder window:applWindow.
+        applWindow client:specTool spec:#windowSpec builder:applBuilder.
+        applBuilder window:applWindow.
+
+        specTool modifiedHolder:modifiedChannel.
     ].
     ^ noteBook
 !
@@ -2438,21 +2445,24 @@
 !
 
 raiseTabView
+    |appl|
 
     self isLayoutToolSelected ifTrue:[
-        helpCanvas   unmap.
-        specCanvas   unmap.
-        layoutCanvas realize.
+        helpTool   window unmap.
+        specTool   window unmap.
+        layoutTool window realize.
     ] ifFalse:[
         self isHelpToolSelected ifTrue:[
-            layoutCanvas unmap.
-            specCanvas   unmap.
-            helpCanvas   realize.
+            layoutTool window unmap.
+            specTool   window unmap.
+            helpTool   window realize.
         ] ifFalse:[
-            layoutCanvas unmap.
-            helpCanvas   unmap.
-            specCanvas   realize.
-            specCanvas application selection:tabSelection.
+            specTool selection:tabSelection.
+            helpTool   window unmap.
+            layoutTool window unmap.
+            specTool   window realize.
+
+"/            specTool selection:tabSelection.
         ]
     ]
 
@@ -2544,19 +2554,15 @@
 helpTool
     "returns the help tool"
 
-    helpCanvas isNil ifTrue:[
-	self noteBookView
-    ].
-    ^ helpCanvas application
+    helpTool isNil ifTrue:[self noteBookView].
+  ^ helpTool
 !
 
 layoutTool
     "returns the layout tool"
 
-    layoutCanvas isNil ifTrue:[
-	self noteBookView
-    ].
-    ^ layoutCanvas application
+    layoutTool isNil ifTrue:[self noteBookView].
+  ^ layoutTool
 !
 
 painter
@@ -2568,10 +2574,8 @@
 specTool
     "returns the spec tool"
 
-    specCanvas isNil ifTrue:[
-	self noteBookView
-    ].
-    ^ specCanvas application
+    specTool isNil ifTrue:[self noteBookView].
+  ^ specTool
 ! !
 
 !UIPainter methodsFor:'queries'!