--- a/UIPainter.st	Fri May 22 20:45:26 1998 +0200
+++ b/UIPainter.st	Mon May 25 20:02:13 1998 +0200
@@ -2045,7 +2045,7 @@
     cls isNil ifTrue:[
         cls := specClass.
     ].
-    (cls isNil or:[(cls := self resolveName:cls) isNil]) ifTrue:[
+    (cls := self resolveName:cls inClass:(Smalltalk at: specClass)) isNil ifTrue:[
         spec majorKey isNil ifTrue:[
             ^ self warn:'Cannot find class (no majorKey specified)'.
         ].
@@ -2592,8 +2592,6 @@
     self valueOfCanCopy value: canCutOrCopy.
     self valueOfCanPaste value: canPaste.            
     self valueOfCanPasteWithKeepingLayout value: (canPaste &  self canKeepLayoutInSelection).
-
-
 ! !
 
 !UIPainter methodsFor:'settings'!
@@ -3502,10 +3500,9 @@
     "sets a window spec from aWindowSpec"
 
     windowSpec := WindowSpec new copyValuesFromSpec:aWindowSpec.
-    self canvasNameChanged:aWindowSpec name.           
+    self canvas topView name: aWindowSpec name.
+    self canvasNameChanged: aWindowSpec name.
     self application treeSelection.
-
-
 ! !
 
 !UIPainter::TreeView methodsFor:'canvas selection'!