--- a/MenuView.st Thu Mar 07 19:46:39 1996 +0100
+++ b/MenuView.st Thu Mar 07 19:49:31 1996 +0100
@@ -1535,9 +1535,12 @@
initEvents
super initEvents.
self enableLeaveEvents.
+
windowGroup notNil ifTrue:[
- windowGroup sensor compressMotionEvents:true
+ windowGroup sensor compressMotionEvents:true
]
+
+ "Modified: 7.3.1996 / 14:18:09 / cg"
!
initStyle
@@ -1781,7 +1784,11 @@
AbortSignal handle:[:ex |
ex return
] do:[
- actionBlock value:selection
+ actionBlock numArgs == 1 ifTrue:[
+ actionBlock value:selection
+ ] ifFalse:[
+ actionBlock value:self value:selection
+ ]
]
] ifFalse:[
selectors notNil ifTrue: [
@@ -1826,7 +1833,7 @@
]
"Created: 4.3.1996 / 11:19:22 / cg"
- "Modified: 5.3.1996 / 14:47:56 / cg"
+ "Modified: 7.3.1996 / 18:59:59 / cg"
!
recomputeSize
@@ -1929,26 +1936,35 @@
to map the subview there
"
org := device
- translatePoint:(mx @ my)
- from:(self id)
- to:(device rootWindowId).
-
-"/ mhmh - is this still needed ?
+ translatePoint:(mx @ my)
+ from:(self id)
+ to:(device rootWindowId).
+
"
before showing, process all of my expose events
"
+ "/ mhmh - is this still needed ?
windowGroup notNil ifTrue:[
- windowGroup processExposeEvents
+ windowGroup processExposeEvents
].
m superMenu:self.
+ actionBlock notNil ifTrue:[
+ "/ mhmh - I am an ST-80 style menu
+ "/ which does not send any messages to the receiver,
+ "/ but returns the selector instead.
+ "/ let my submenu do so as well ...
+
+ m menuView action:actionBlock
+ ].
+
"
realize the submenu in MY windowgroup
"
windowGroup notNil ifTrue:[
- m windowGroup:windowGroup.
- windowGroup addTopView:m.
+ m windowGroup:windowGroup.
+ windowGroup addTopView:m.
].
m fixSize.
m origin:org.
@@ -1958,6 +1974,8 @@
device flush.
subMenuShown := m
+
+ "Modified: 7.3.1996 / 18:23:59 / cg"
! !
!MenuView methodsFor:'queries'!
@@ -2360,5 +2378,5 @@
!MenuView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.60 1996-03-07 12:57:36 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.61 1996-03-07 18:49:04 cg Exp $'
! !