--- a/PopUpMenu.st	Tue Feb 25 20:19:31 1997 +0100
+++ b/PopUpMenu.st	Tue Feb 25 20:53:17 1997 +0100
@@ -391,8 +391,10 @@
 
     newMenu := self onSameDeviceAs:aMenuView. 
     newMenu addSubView:aMenuView.
-    newMenu menu:aMenuView.
+    newMenu menuView:aMenuView.
     ^ newMenu
+
+    "Modified: 25.2.1997 / 20:52:42 / cg"
 !
 
 labels:labels args:args 
@@ -482,7 +484,7 @@
     |newMenu|
 
     newMenu := self onSameDeviceAs:aView. 
-    newMenu menu:(MenuView
+    newMenu menuView:(MenuView
                     labels:labels
                     selectors:selectors
                     accelerators:shorties 
@@ -492,6 +494,7 @@
     ^ newMenu
 
     "Created: 28.2.1996 / 18:59:25 / cg"
+    "Modified: 25.2.1997 / 20:52:47 / cg"
 !
 
 labels:labels selectors:selectors accelerators:shorties receiver:anObject
@@ -891,29 +894,31 @@
     offs := 1.
     dstOffs := 1.
     1 to:lineArray size do:[:lineIndex |
-	linePos := lineArray at:lineIndex.
-	[offs <= linePos] whileTrue:[
-	    convertedLabels at:dstOffs put:(labelArray at:offs).
-	    argArray at:dstOffs put:offs.
-	    offs := offs + 1.
-	    dstOffs := dstOffs + 1
-	].
-	convertedLabels at:dstOffs put:'-'.
-	argArray at:dstOffs put:nil.
-	dstOffs := dstOffs + 1
+        linePos := lineArray at:lineIndex.
+        [offs <= linePos] whileTrue:[
+            convertedLabels at:dstOffs put:(labelArray at:offs).
+            argArray at:dstOffs put:offs.
+            offs := offs + 1.
+            dstOffs := dstOffs + 1
+        ].
+        convertedLabels at:dstOffs put:'-'.
+        argArray at:dstOffs put:nil.
+        dstOffs := dstOffs + 1
     ].
     [offs <= labelArray size] whileTrue:[
-	convertedLabels at:dstOffs put:(labelArray at:offs).
-	argArray at:dstOffs put:offs.
-	offs := offs + 1.
-	dstOffs := dstOffs + 1
+        convertedLabels at:dstOffs put:(labelArray at:offs).
+        argArray at:dstOffs put:offs.
+        offs := offs + 1.
+        dstOffs := dstOffs + 1
     ].
-    self menu:(MenuView
-			labels:convertedLabels
-		     selectors:nil
-			  args:argArray
-		      receiver:nil 
-			    in:self)
+    self menuView:(MenuView
+                        labels:convertedLabels
+                     selectors:nil
+                          args:argArray
+                      receiver:nil 
+                            in:self)
+
+    "Modified: 25.2.1997 / 20:52:49 / cg"
 !
 
 lines
@@ -1253,13 +1258,13 @@
 
 !PopUpMenu methodsFor:'private accessing'!
 
-menu:aMenu
+menu:aMenuView
     "set the actual menu"
 
-    menuView := aMenu.
-    menuView origin:(margin @ margin).
-    menuView borderWidth:0.
-    menuView masterView:self
+    self obsoleteMethodWarning:'use #menuView:'.
+    self menuView:aMenuView
+
+    "Modified: 25.2.1997 / 20:52:08 / cg"
 !
 
 menuView
@@ -1268,10 +1273,23 @@
     ^ menuView
 !
 
+menuView:aMenu
+    "set the actual menu"
+
+    menuView := aMenu.
+    menuView origin:(margin @ margin).
+    menuView borderWidth:0.
+    menuView masterView:self
+
+    "Created: 25.2.1997 / 20:51:42 / cg"
+!
+
 superMenu:aMenu
-    "return the superMenu"
+    "set the superMenu"
 
     menuView superMenu:aMenu
+
+    "Modified: 25.2.1997 / 20:52:20 / cg"
 ! !
 
 !PopUpMenu methodsFor:'realization'!
@@ -1301,5 +1319,5 @@
 !PopUpMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.60 1997-01-22 17:21:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.61 1997-02-25 19:53:17 cg Exp $'
 ! !