Controller.st
changeset 472 621c17076f00
parent 469 6a263638989c
child 502 0df8d2b173e4
--- a/Controller.st	Tue Feb 27 16:29:32 1996 +0100
+++ b/Controller.st	Wed Feb 28 19:52:31 1996 +0100
@@ -103,41 +103,45 @@
 
     |menu actionSelector menuPerformer|
 
-    menu := self yellowButtonMenu.
-    menu notNil ifTrue:[
-	menuPerformer := self menuPerformer.
-
-	"
-	 got one, launch the menu. It is supposed
-	 to return an actionSelector.
-	"
-	"
-	 a temporary kludge: subMenus dont know about 
-	 actionSelectors yet ...
-	"
-	menu receiver isNil ifTrue:[
-	    menu receiver:menuPerformer
-	] ifFalse:[
-	    "
-	     if the menu has an explicit receiver, 
-	     thats the one to do the work.
-	    "
-	    menuPerformer := menu receiver
-	].
-	actionSelector := menu startUp.
-
-	(actionSelector notNil
-	and:[actionSelector isSymbol]) ifTrue:[
-	    menuPerformer perform:actionSelector
-	].
-	^ self
-    ].
     "
      ST/X style static menus - going to be obsoleted ...
     "
     (menu := view middleButtonMenu) notNil ifTrue:[
-	menu showAtPointer
-    ]
+        menu showAtPointer.
+        ^ self
+    ].
+
+    menu := self yellowButtonMenu.
+    menu notNil ifTrue:[
+        menuPerformer := self menuPerformer.
+
+        "
+         got one, launch the menu. It is supposed
+         to return an actionSelector.
+        "
+        "
+         a temporary kludge: subMenus dont know about 
+         actionSelectors yet ...
+        "
+        menu receiver isNil ifTrue:[
+            menu receiver:menuPerformer
+        ] ifFalse:[
+            "
+             if the menu has an explicit receiver, 
+             thats the one to do the work.
+            "
+            menuPerformer := menu receiver
+        ].
+        actionSelector := menu startUp.
+
+        (actionSelector notNil
+        and:[actionSelector isSymbol]) ifTrue:[
+            menuPerformer perform:actionSelector
+        ].
+        ^ self
+    ].
+
+    "Modified: 28.2.1996 / 17:32:42 / cg"
 ! !
 
 !Controller methodsFor:'accessing'!
@@ -460,5 +464,5 @@
 !Controller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Controller.st,v 1.30 1996-02-27 13:51:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Controller.st,v 1.31 1996-02-28 18:51:43 cg Exp $'
 ! !