--- a/AppModel.st Fri Jun 20 19:31:49 1997 +0200
+++ b/AppModel.st Fri Jun 20 19:32:12 1997 +0200
@@ -657,20 +657,35 @@
helpTextFor:aComponent
"activeHelp interface: return some help text for a component"
- |key helpText cls|
+ |key cls|
builder notNil ifTrue:[
cls := self class.
(cls respondsTo:#helpSpec) ifTrue:[
(key := builder helpKeyFor:aComponent) notNil ifTrue:[
- helpText := (cls helpSpec) at:key ifAbsent:nil
+ ^ self helpTextForKey:key
]
]
].
+ masterApplication notNil ifTrue:[
+ ^ masterApplication helpTextFor:aComponent
+ ].
+ ^ nil
+!
+helpTextForKey:aKey
+ "activeHelp interface: return some help text for a key"
+
+ |cls helpText|
+
+ cls := self class.
+
+ (cls respondsTo:#helpSpec) ifTrue:[
+ helpText := (cls helpSpec) at:aKey ifAbsent:nil
+ ].
(masterApplication notNil and:[helpText isNil]) ifTrue:[
- helpText := masterApplication helpTextFor:aComponent
+ helpText := masterApplication helpTextForKey:aKey
].
^ helpText
!
@@ -1364,6 +1379,6 @@
!ApplicationModel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.54 1997-06-17 11:13:58 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.55 1997-06-20 17:32:12 ca Exp $'
! !
ApplicationModel initialize!
--- a/ApplicationModel.st Fri Jun 20 19:31:49 1997 +0200
+++ b/ApplicationModel.st Fri Jun 20 19:32:12 1997 +0200
@@ -657,20 +657,35 @@
helpTextFor:aComponent
"activeHelp interface: return some help text for a component"
- |key helpText cls|
+ |key cls|
builder notNil ifTrue:[
cls := self class.
(cls respondsTo:#helpSpec) ifTrue:[
(key := builder helpKeyFor:aComponent) notNil ifTrue:[
- helpText := (cls helpSpec) at:key ifAbsent:nil
+ ^ self helpTextForKey:key
]
]
].
+ masterApplication notNil ifTrue:[
+ ^ masterApplication helpTextFor:aComponent
+ ].
+ ^ nil
+!
+helpTextForKey:aKey
+ "activeHelp interface: return some help text for a key"
+
+ |cls helpText|
+
+ cls := self class.
+
+ (cls respondsTo:#helpSpec) ifTrue:[
+ helpText := (cls helpSpec) at:aKey ifAbsent:nil
+ ].
(masterApplication notNil and:[helpText isNil]) ifTrue:[
- helpText := masterApplication helpTextFor:aComponent
+ helpText := masterApplication helpTextForKey:aKey
].
^ helpText
!
@@ -1364,6 +1379,6 @@
!ApplicationModel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.54 1997-06-17 11:13:58 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.55 1997-06-20 17:32:12 ca Exp $'
! !
ApplicationModel initialize!