--- a/Launcher.st	Sat Jan 06 18:39:43 1996 +0100
+++ b/Launcher.st	Wed Jan 10 16:06:04 1996 +0100
@@ -931,7 +931,7 @@
 !
 
 miscSettings
-    |box check logDoits shadows updChanges changeFileName
+    |box check logDoits shadows updChanges changeFileName returnFocus
      loadBinaries compileLazy hostNameInLabel useManager y component|
 
     "/
@@ -940,6 +940,7 @@
     logDoits := Smalltalk logDoits asValue.
     shadows := PopUpView shadows asValue.
     hostNameInLabel := StandardSystemView includeHostNameInLabel asValue.
+    returnFocus := Dialog returnFocusWhenClosingModalBoxes asValue.
     updChanges := Class updatingChanges asValue.
     changeFileName := ObjectMemory nameForChanges asValue.
     useManager := (Smalltalk at:#SourceCodeManager) notNil asValue.
@@ -968,19 +969,20 @@
     box addCheckBox:(resources string:'lazy compilation when autoloading') on:compileLazy.
     check := box addCheckBox:(resources string:'if present, load binary objects when autoloading') on:loadBinaries.
     ObjectFileLoader isNil ifTrue:[
-	loadBinaries value:false.
-	check disable
+        loadBinaries value:false.
+        check disable
     ].
 
     check := box addCheckBox:(resources string:'sourcecode from sourcecode management') on:useManager.
     (AbstractSourceCodeManager isNil 
     or:[AbstractSourceCodeManager defaultManager isNil]) ifTrue:[
-	useManager value:false.
-	check disable
+        useManager value:false.
+        check disable
     ].
     box addHorizontalLine.
 
     box addCheckBox:(resources string:'shadows under popup views') on:shadows.
+    box addCheckBox:(resources string:'boxes return focus to previously active view') on:returnFocus.
     box addCheckBox:(resources string:'hostname in window labels') on:hostNameInLabel.
 
     box addAbortButton; addOkButton.
@@ -994,20 +996,22 @@
     "/ update system settings
     "/
     box accepted ifTrue:[
-	Smalltalk logDoits:logDoits value.
-	PopUpView shadows:shadows value.
-	Class updateChanges:updChanges value.
-	Autoload compileLazy:compileLazy value.
-	Smalltalk loadBinaries:loadBinaries value.
-	StandardSystemView includeHostNameInLabel:hostNameInLabel value.
-	ObjectMemory nameForChanges:changeFileName value.
-	useManager value ifTrue:[
-	    (Smalltalk at:#SourceCodeManager) isNil ifTrue:[
-		Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager)
-	    ]
-	] ifFalse:[
-	    Smalltalk at:#SourceCodeManager put:nil
-	]
+        Smalltalk logDoits:logDoits value.
+        PopUpView shadows:shadows value.
+        Class updateChanges:updChanges value.
+        Autoload compileLazy:compileLazy value.
+        Smalltalk loadBinaries:loadBinaries value.
+        StandardSystemView includeHostNameInLabel:hostNameInLabel value.
+        ObjectMemory nameForChanges:changeFileName value.
+        Dialog returnFocusWhenClosingModalBoxes:returnFocus value.
+
+        useManager value ifTrue:[
+            (Smalltalk at:#SourceCodeManager) isNil ifTrue:[
+                Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager)
+            ]
+        ] ifFalse:[
+            Smalltalk at:#SourceCodeManager put:nil
+        ]
     ].
     box destroy
 
@@ -1969,5 +1973,5 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.70 1995-12-23 11:47:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.71 1996-01-10 15:06:04 ca Exp $'
 ! !