--- a/WindowGroup.st	Fri Jan 12 14:39:38 2001 +0100
+++ b/WindowGroup.st	Mon Jan 15 18:32:40 2001 +0100
@@ -1979,23 +1979,25 @@
     myDisplay := self graphicsDevice.
     (myDisplay notNil 
     and:[myDisplay activateOnClick:nil]) ifTrue:[
-	prevFocusView := myDisplay focusView.
-	(prevFocusView notNil 
-	and:[prevFocusView windowGroup ~~ aView windowGroup]) ifTrue:[
-	    "/ a view from another windowGroup requests the focus.
-	    "/ Do not grant this, if in windows-activateOnClick mode.
+        prevFocusView := myDisplay focusView.
+        (prevFocusView notNil 
+        and:[prevFocusView windowGroup ~~ aView windowGroup]) ifTrue:[
+            "/ a view from another windowGroup requests the focus.
+            "/ Do not grant this, if in windows-activateOnClick mode.
 
 "/            ' not granted' printCR.
-	    myDisplay setInputFocusTo:prevFocusView.
-	    ^ false
-	].
+            myDisplay setInputFocusTo:prevFocusView.
+            ^ false
+        ].
     ].
 
 "/    ' granted' printCR.
 
     (focusView isNil or:[focusByTab not]) ifTrue:[
-	self focusView:aView byTab:false.
-	^ true
+        (aView isNil or:[aView ~~ focusView]) ifTrue:[
+            self focusView:aView byTab:false.
+        ].
+        ^ true
     ].
     ^ false
 
@@ -2581,6 +2583,6 @@
 !WindowGroup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.223 2000-12-08 15:01:57 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.224 2001-01-15 17:32:40 tm Exp $'
 ! !
 WindowGroup initialize!