--- a/DeviceWorkstation.st	Wed Jan 30 16:58:10 2013 +0100
+++ b/DeviceWorkstation.st	Wed Jan 30 18:44:57 2013 +0100
@@ -4320,21 +4320,25 @@
     |sensor button|
 
     aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
+        "/ event arrived, after I destroyed it myself
+        ^ self
     ].
 
     button := buttonArg.
+    "/ used that for X on a mac, with a single button.
+    "/ No longer done automatically.
     (metaDown and:[button == 1]) ifTrue:[
-	button := 2.
+        UserPreferences current button2WithAltKey ifTrue:[
+            button := 2.
+        ].
     ].
 
     sensor := aView sensor.
     WindowsRightButtonBehavior == true ifTrue:[
-	button >= 2 ifTrue:[
-	    sensor buttonPress:1 x:x y:y view:aView.
-	    ^ self.
-	]
+        button >= 2 ifTrue:[
+            sensor buttonPress:1 x:x y:y view:aView.
+            ^ self.
+        ]
     ].
     sensor buttonPress:button x:x y:y view:aView
 !
@@ -8233,11 +8237,11 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.577 2013-01-21 13:55:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.578 2013-01-30 17:44:57 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.577 2013-01-21 13:55:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.578 2013-01-30 17:44:57 cg Exp $'
 ! !