--- a/UIPainter.st	Wed Feb 15 22:54:52 2006 +0100
+++ b/UIPainter.st	Wed Feb 15 22:55:02 2006 +0100
@@ -1098,7 +1098,7 @@
               menu: menuToolbar
             )
            (VariableHorizontalPanelSpec
-              name: 'hpanel'
+              name: 'mainPanel'
               layout: (LayoutFrame 0 0.0 32 0.0 0 1.0 -24 1.0)
               level: 1
               component: 
@@ -2905,7 +2905,7 @@
 
     specClassName isNil ifTrue: [^'No class and selector defined.'].
     specSelector isNil ifTrue: [^'No selector defined.'].
-    ^specClassName printString, ' >> ', specSelector
+    ^ specClassName printString, ' >> ', specSelector
 
     "Modified: / 20.6.1998 / 16:49:16 / cg"
 ! !
@@ -3071,9 +3071,9 @@
     ].
 
     specSuperclassName isBehavior ifFalse:[
-        specSuperclassName isEmpty ifFalse:[
+        specSuperclassName notEmptyOrNil ifTrue:[
             superclass := self resolveName:specSuperclassName
-        ] ifTrue:[
+        ] ifFalse:[
             specSuperclassName := nil.
         ]
     ] ifTrue:[
@@ -3524,6 +3524,7 @@
         (builder componentAt:'acceptButton') label:(resources string:'Apply')
     ].
 
+    self updateInfoLabel.
     "Modified: / 22.8.1998 / 17:41:34 / cg"
 !
 
@@ -3671,9 +3672,6 @@
 postBuildWith: aBuilder
     super postBuildWith:aBuilder.
 
-    specSelector := nil.
-    specClassName    := nil.
-
     self setupPainter.
 
     "Modified: / 22.8.1998 / 17:41:34 / cg"
@@ -4247,7 +4245,7 @@
 doSave
     "saves the window spec"
     
-    |code painter|
+    |code painter specClass|
 
     self askForSectionModification.
     self hasSpecClassAndSelector ifFalse:[
@@ -4255,14 +4253,16 @@
             ^ nil
         ]
     ].
-    
-    (specClassName notNil and:[ specClassName isClass ]) ifFalse:[
+
+    specClass := self resolveName:specClassName.
+    (specClass notNil and:[ specClass isClass ]) ifFalse:[
         self warn:('Oops - cannot save - class not found: ' , specClassName).
         ^ nil
     ].
+
     painter := self painter.
     painter 
-        class:specClassName
+        class:specClass
         superclassName:specSuperclassName
         selector:specSelector.
 
@@ -4282,8 +4282,8 @@
     self updateInfoLabel.
     modified := false.
     painter resetModification.
-    (specClassName respondsTo:specSelector) ifTrue:[
-        self addHistoryEntryForClass:specClassName selector:specSelector.
+    (specClass respondsTo:specSelector) ifTrue:[
+        self addHistoryEntryForClass:specClass selector:specSelector.
     ].
 !