--- a/WindowBuilder.st	Mon Jan 09 09:52:13 2006 +0100
+++ b/WindowBuilder.st	Mon Jan 09 09:53:28 2006 +0100
@@ -425,12 +425,16 @@
 
     |v key|
 
-    helpKeys isNil ifTrue:[^ nil].
     v := aComponent.
     [v notNil] whileTrue:[
-        (key := helpKeys at:v ifAbsent:nil) notNil ifTrue:[
+        (key := v helpKey) notNil ifTrue:[
             ^ key
         ].
+"/        helpKeys notNil ifTrue:[
+"/            (key := helpKeys at:v ifAbsent:nil) notNil ifTrue:[
+"/                ^ key
+"/            ].
+"/        ].
         v := v superView
     ].
     ^ nil
@@ -440,16 +444,18 @@
     "assign a key for a component which is used to access the help text
      from the application."
 
-    aKey isNil ifTrue:[
-        helpKeys isNil ifFalse:[
-            helpKeys removeKey:aComponent ifAbsent:nil
-        ]
-    ] ifFalse:[
-        helpKeys isNil ifTrue:[
-            helpKeys := IdentityDictionary new
-        ].
-        helpKeys at:aComponent put:aKey
-    ]
+    aComponent helpKey:aKey.
+
+"/    aKey isNil ifTrue:[
+"/        helpKeys isNil ifFalse:[
+"/            helpKeys removeKey:aComponent ifAbsent:nil
+"/        ]
+"/    ] ifFalse:[
+"/        helpKeys isNil ifTrue:[
+"/            helpKeys := IdentityDictionary new
+"/        ].
+"/        helpKeys at:aComponent put:aKey
+"/    ]
 !
 
 keyboardProcessor
@@ -1369,5 +1375,5 @@
 !WindowBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.120 2004-09-20 08:44:31 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/WindowBuilder.st,v 1.121 2006-01-09 08:53:28 cg Exp $'
 ! !