--- a/ContrWMenu.st	Thu Jan 02 17:29:06 1997 +0100
+++ b/ContrWMenu.st	Thu Jan 02 17:39:36 1997 +0100
@@ -11,10 +11,10 @@
 "
 
 Controller subclass:#ControllerWithMenu
-       instanceVariableNames:'menuHolder performer'
-       classVariableNames:''
-       poolDictionaries:''
-       category:'Interface-Support-Controllers'
+	instanceVariableNames:'menuHolder performer'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Interface-Support-Controllers'
 !
 
 !ControllerWithMenu class methodsFor:'documentation'!
@@ -33,10 +33,6 @@
 "
 !
 
-version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/ContrWMenu.st,v 1.6 1995-11-11 15:48:50 cg Exp $'
-!
-
 documentation
 "
     ControllerWithMenus is a very simple controller for a view with
@@ -45,42 +41,57 @@
 "
 ! !
 
-!ControllerWithMenu  methodsFor:'accessing'!
+!ControllerWithMenu methodsFor:'accessing'!
+
+menu
+    "can be redefined in subclasses"
 
-menuHolder:aValueHolder
-    menuHolder := aValueHolder
+    menuHolder notNil ifTrue:[
+	^ menuHolder value
+    ].
+    ^ nil
 !
 
 menuHolder
     ^ menuHolder
 !
 
+menuHolder:aValueHolder
+    menuHolder := aValueHolder
+!
+
 performer 
     ^ performer 
 !
 
 performer:anObject
     performer  := anObject
-!
-
-menu
-    "can be redefined in subclasses"
-
-    menuHolder notNil ifTrue:[
-	^ menuHolder value
-    ].
-    ^ nil
 ! !
 
-!ControllerWithMenu  methodsFor:'events'!
+!ControllerWithMenu methodsFor:'events'!
 
 yellowButtonActivity
     |m selection|
 
     (m := self menu) notNil ifTrue:[
-	selection := self menu startUp.
-	selection ~~ 0 ifTrue:[
-	    self perform:selection
-	]
+        selection := self menu startUp.
+        selection ~~ 0 ifTrue:[
+            performer perform:selection
+        ]
     ]
 ! !
+
+!ControllerWithMenu methodsFor:'initialization'!
+
+initialize
+    "I am the default menu performer"
+
+    performer := self
+
+! !
+
+!ControllerWithMenu class methodsFor:'documentation'!
+
+version
+    ^ '$Header: /cvs/stx/stx/libview/Attic/ContrWMenu.st,v 1.7 1997-01-02 16:39:36 stefan Exp $'
+! !

--- a/ControllerWithMenu.st	Thu Jan 02 17:29:06 1997 +0100
+++ b/ControllerWithMenu.st	Thu Jan 02 17:39:36 1997 +0100
@@ -11,10 +11,10 @@
 "
 
 Controller subclass:#ControllerWithMenu
-       instanceVariableNames:'menuHolder performer'
-       classVariableNames:''
-       poolDictionaries:''
-       category:'Interface-Support-Controllers'
+	instanceVariableNames:'menuHolder performer'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Interface-Support-Controllers'
 !
 
 !ControllerWithMenu class methodsFor:'documentation'!
@@ -33,10 +33,6 @@
 "
 !
 
-version
-    ^ '$Header: /cvs/stx/stx/libview/ControllerWithMenu.st,v 1.6 1995-11-11 15:48:50 cg Exp $'
-!
-
 documentation
 "
     ControllerWithMenus is a very simple controller for a view with
@@ -45,42 +41,57 @@
 "
 ! !
 
-!ControllerWithMenu  methodsFor:'accessing'!
+!ControllerWithMenu methodsFor:'accessing'!
+
+menu
+    "can be redefined in subclasses"
 
-menuHolder:aValueHolder
-    menuHolder := aValueHolder
+    menuHolder notNil ifTrue:[
+	^ menuHolder value
+    ].
+    ^ nil
 !
 
 menuHolder
     ^ menuHolder
 !
 
+menuHolder:aValueHolder
+    menuHolder := aValueHolder
+!
+
 performer 
     ^ performer 
 !
 
 performer:anObject
     performer  := anObject
-!
-
-menu
-    "can be redefined in subclasses"
-
-    menuHolder notNil ifTrue:[
-	^ menuHolder value
-    ].
-    ^ nil
 ! !
 
-!ControllerWithMenu  methodsFor:'events'!
+!ControllerWithMenu methodsFor:'events'!
 
 yellowButtonActivity
     |m selection|
 
     (m := self menu) notNil ifTrue:[
-	selection := self menu startUp.
-	selection ~~ 0 ifTrue:[
-	    self perform:selection
-	]
+        selection := self menu startUp.
+        selection ~~ 0 ifTrue:[
+            performer perform:selection
+        ]
     ]
 ! !
+
+!ControllerWithMenu methodsFor:'initialization'!
+
+initialize
+    "I am the default menu performer"
+
+    performer := self
+
+! !
+
+!ControllerWithMenu class methodsFor:'documentation'!
+
+version
+    ^ '$Header: /cvs/stx/stx/libview/ControllerWithMenu.st,v 1.7 1997-01-02 16:39:36 stefan Exp $'
+! !