PopUpMenu.st
changeset 1175 9c8aec66cc17
parent 1150 ce8842029d20
child 1233 c9cd0547db29
--- a/PopUpMenu.st	Tue Apr 01 15:04:05 1997 +0200
+++ b/PopUpMenu.st	Wed Apr 02 16:03:49 1997 +0200
@@ -705,9 +705,9 @@
     |return rec sel0 sel1 arg|
 
     return := 0.
-    menuView args notNil ifTrue:[
-        return := nil
-    ].
+"/    menuView args notNil ifTrue:[
+"/        return := nil
+"/    ].
 
     "/
     "/ arrange for the menu to evaluate this action,
@@ -725,7 +725,7 @@
 
             selected isNil ifTrue:[
                 "/ the menu has already sent a message or performed an item-action; do nothing here
-                ^ nil
+                ^ 0
             ].
 
             retVal := 0.
@@ -806,7 +806,7 @@
     "
 
     "Created: 10.1.1996 / 20:11:42 / cg"
-    "Modified: 30.5.1996 / 09:16:57 / cg"
+    "Modified: 2.4.1997 / 16:03:23 / cg"
 !
 
 startUpWithHeading:aString
@@ -880,7 +880,7 @@
     "define the menu the ST-80 way (with labels and lines defined separately)"
 
     |labelArray argArray convertedLabels 
-     offs dstOffs linePos|
+     offs dstOffs linePos m|
 
     actionLabels := labelString.
     actionLines := lineArray.
@@ -911,14 +911,17 @@
         offs := offs + 1.
         dstOffs := dstOffs + 1
     ].
-    self menuView:(MenuView
-                        labels:convertedLabels
-                     selectors:nil
-                          args:argArray
-                      receiver:nil 
-                            in:self)
 
-    "Modified: 25.2.1997 / 20:52:49 / cg"
+    m := MenuView
+            labels:convertedLabels
+            selectors:nil
+            args:argArray
+            receiver:nil 
+            in:self.
+
+    self menuView:m
+
+    "Modified: 2.4.1997 / 15:57:52 / cg"
 !
 
 lines
@@ -1322,5 +1325,5 @@
 !PopUpMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.63 1997-03-21 12:12:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.64 1997-04-02 14:03:49 cg Exp $'
 ! !