--- a/UIGalleryView.st	Wed Oct 15 15:39:41 1997 +0200
+++ b/UIGalleryView.st	Wed Oct 15 15:41:28 1997 +0200
@@ -134,7 +134,15 @@
 majorKey:aKey
     "get the class providing the window specifications
     "
-    majorKey := self resolveName:aKey.
+    |appl|
+
+    appl := self application.
+
+    appl notNil ifTrue:[
+        majorKey := appl resolveName:aKey
+    ] ifFalse:[
+        majorKey := Smalltalk resolveName:aKey inClass:self class
+    ].
     self selection:nil
 !
 

--- a/UIHelpTool.st	Wed Oct 15 15:39:41 1997 +0200
+++ b/UIHelpTool.st	Wed Oct 15 15:41:28 1997 +0200
@@ -276,22 +276,6 @@
       )
 ! !
 
-!UIHelpTool class methodsFor:'misc'!
-
-applicationClassAssociatedWith:aClass
-    "get application class keeping the associated help text or nil
-    "
-    |cls|
-
-    cls := self resolveName:aClass.
-
-    (cls notNil and:[cls includesBehavior:UISpecification]) ifTrue:[
-        ^ UISpecificationTool
-    ].
-  ^ cls
-
-! !
-
 !UIHelpTool methodsFor:'accessing'!
 
 dictionary
@@ -329,7 +313,7 @@
     "
     |help|
 
-    specClass := self class applicationClassAssociatedWith:aClass.
+    specClass := self applicationClassAssociatedWith:aClass.
 
     (specClass respondsTo:#helpSpec) ifTrue:[
         help := specClass helpSpec
@@ -383,7 +367,7 @@
     "
     |cls src|
 
-    cls := self class applicationClassAssociatedWith:aClass.
+    cls := self applicationClassAssociatedWith:aClass.
 
     cls isNil ifTrue:[
         ^ self information:'no application class defined'.
@@ -497,6 +481,23 @@
     ^ view
 ! !
 
+!UIHelpTool methodsFor:'queries'!
+
+applicationClassAssociatedWith:aClass
+    "get application class keeping the associated help text or nil
+    "
+    |cls|
+
+    cls := self resolveName:aClass.
+
+    (cls notNil and:[cls includesBehavior:UISpecification]) ifTrue:[
+        ^ UISpecificationTool
+    ].
+  ^ cls
+
+
+! !
+
 !UIHelpTool methodsFor:'selection'!
 
 listSelection
@@ -565,7 +566,7 @@
             ) accepted.
 
         accepted ifFalse:[^ self].
-        cls := self class applicationClassAssociatedWith:cls value.
+        cls := self applicationClassAssociatedWith:cls value.
 
         cls notNil ifTrue:[
             ^ self helpSpecFrom:cls

--- a/UIPainterView.st	Wed Oct 15 15:39:41 1997 +0200
+++ b/UIPainterView.st	Wed Oct 15 15:41:28 1997 +0200
@@ -685,6 +685,19 @@
 
 ! !
 
+!UIPainterView methodsFor:'queries'!
+
+resolveName:aName
+    |appl|
+
+    appl := self application.
+
+    appl notNil ifTrue:[
+        ^ appl resolveName:aName
+    ].
+    ^ Smalltalk resolveName:aName inClass:self class
+! !
+
 !UIPainterView methodsFor:'removing components'!
 
 remove:anObject