--- a/Launcher.st	Thu Oct 01 12:54:39 1998 +0200
+++ b/Launcher.st	Fri Oct 02 12:56:52 1998 +0200
@@ -3952,9 +3952,7 @@
     hostNameInLabelHolder := hostNameInLabel asValue.
     returnFocus := StandardSystemView returnFocusWhenClosingModalBoxes asValue.
     takeFocus := StandardSystemView takeFocusWhenMapped asValue.
-    Display platformName = 'WIN32' ifTrue:[
-        activateOnClick := (WinWorkstation activateOnClick:nil) asValue
-    ].
+    activateOnClick := (Display class activateOnClick:nil) asValue.
 
     showAccelerators := MenuView showAcceleratorKeys asValue.
     preemptive := Processor isTimeSlicing asValue.
@@ -3985,9 +3983,8 @@
     box addCheckBox:(resources string:'views catch focus when mapped') on:takeFocus.
     box addCheckBox:(resources string:'hostname in window labels') on:hostNameInLabelHolder.
     box addCheckBox:(resources string:'show accelerator keys in menus') on:showAccelerators.
-    activateOnClick notNil ifTrue:[
-        box addCheckBox:(resources string:'raise & activate windows on click') on:activateOnClick.
-    ].
+    box addCheckBox:(resources string:'raise & activate windows on click') on:activateOnClick.
+
     box addHorizontalLine.
 
     box addCheckBox:(resources string:'preemptive scheduling') on:preemptive.
@@ -4056,9 +4053,7 @@
         ].
         StandardSystemView returnFocusWhenClosingModalBoxes:returnFocus value.
         StandardSystemView takeFocusWhenMapped:takeFocus value.
-        activateOnClick notNil ifTrue:[
-            WinWorkstation activateOnClick:(activateOnClick value)
-        ].
+        Display class activateOnClick:(activateOnClick value).
 
         MenuView showAcceleratorKeys:showAccelerators value.
         Processor isTimeSlicing ~~ preemptive value ifTrue:[
@@ -5671,5 +5666,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.375 1998-10-01 10:54:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.376 1998-10-02 10:56:52 cg Exp $'
 ! !