--- a/Controll.st Thu Aug 22 09:12:24 1996 +0200
+++ b/Controll.st Thu Aug 22 09:17:33 1996 +0200
@@ -154,14 +154,23 @@
].
actionSelector := menu startUp.
- (actionSelector notNil
- and:[actionSelector isSymbol]) ifTrue:[
- menuPerformer perform:actionSelector
+ actionSelector notNil notNil ifTrue:[
+ actionSelector isSymbol ifTrue:[
+ menuPerformer perform:actionSelector
+ ] ifFalse:[
+ (actionSelector isArray
+ and:[actionSelector size == 2
+ and:[(actionSelector at:1) isSymbol]]) ifTrue:[
+ menuPerformer
+ perform:(actionSelector at:1)
+ with:(actionSelector at:2)
+ ]
+ ]
].
^ self
].
- "Modified: 28.2.1996 / 17:32:42 / cg"
+ "Modified: 22.8.1996 / 09:17:16 / cg"
! !
!Controller methodsFor:'accessing'!
@@ -562,5 +571,5 @@
!Controller class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/Controll.st,v 1.38 1996-08-22 07:12:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/Controll.st,v 1.39 1996-08-22 07:17:33 cg Exp $'
! !
--- a/Controller.st Thu Aug 22 09:12:24 1996 +0200
+++ b/Controller.st Thu Aug 22 09:17:33 1996 +0200
@@ -154,14 +154,23 @@
].
actionSelector := menu startUp.
- (actionSelector notNil
- and:[actionSelector isSymbol]) ifTrue:[
- menuPerformer perform:actionSelector
+ actionSelector notNil notNil ifTrue:[
+ actionSelector isSymbol ifTrue:[
+ menuPerformer perform:actionSelector
+ ] ifFalse:[
+ (actionSelector isArray
+ and:[actionSelector size == 2
+ and:[(actionSelector at:1) isSymbol]]) ifTrue:[
+ menuPerformer
+ perform:(actionSelector at:1)
+ with:(actionSelector at:2)
+ ]
+ ]
].
^ self
].
- "Modified: 28.2.1996 / 17:32:42 / cg"
+ "Modified: 22.8.1996 / 09:17:16 / cg"
! !
!Controller methodsFor:'accessing'!
@@ -562,5 +571,5 @@
!Controller class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Controller.st,v 1.38 1996-08-22 07:12:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Controller.st,v 1.39 1996-08-22 07:17:33 cg Exp $'
! !