--- a/WindowGroup.st	Wed Nov 08 12:10:31 2006 +0100
+++ b/WindowGroup.st	Wed Nov 08 12:14:08 2006 +0100
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libview' }"
 
 Object subclass:#WindowGroup
@@ -416,15 +415,16 @@
     "/
     prevFocusView := aDevice focusView.
     prevFocusView notNil ifTrue:[
-        (prevFocusView notNil
-        and:[(prevFocusGroup := prevFocusView windowGroup) notNil]) ifTrue:[
+        aDevice focusView:nil.
+        (prevFocusGroup := prevFocusView windowGroup) notNil ifTrue:[
             prevFocusCameViaTab := prevFocusGroup focusCameByTab.
 
             prevFocusView showNoFocus:prevFocusCameViaTab. "/ true is bad - see pullDownMenu.
             self sendKeyboardFocusEventTo:prevFocusView withArgument:false.
         ].
     ].
-    aDevice focusView:nil.
+
+    "Modified: / 08-11-2006 / 12:05:22 / cg"
 ! !
 
 !WindowGroup class methodsFor:'others'!
@@ -2257,9 +2257,10 @@
 "/ 'take focus from ' print. prevFocusView printCR. 
             self class takeFocusFromDevice:myDisplay.
         ].
-        myDisplay focusView:aViewOrNil.
     ].
 
+    myDisplay focusView:focusView.
+
     focusView == aViewOrNil ifTrue:[
         focusView notNil ifTrue:[
             "/ this is the case when the mouse-pointer reenters
@@ -2268,7 +2269,6 @@
             focusView showFocus:focusByTab.
 "/ 'give focus to ' print. aViewOrNil printCR. 
             self class sendKeyboardFocusEventTo:aViewOrNil withArgument:true.
-            myDisplay focusView:aViewOrNil.
         ].
         ^ self
     ].
@@ -2278,7 +2278,6 @@
         focusView == aViewOrNil ifTrue:[
 "/ 'give focus to ' print. aViewOrNil printCR. 
             self class sendKeyboardFocusEventTo:aViewOrNil withArgument:true.
-            myDisplay focusView:aViewOrNil.
             ^ self
         ].
     ].
@@ -2290,7 +2289,6 @@
 "/ 'give focus to ' print. aViewOrNil printCR. 
         self class sendKeyboardFocusEventTo:aViewOrNil withArgument:true.
         focusByTab := focusCameViaTab.
-        myDisplay focusView:aViewOrNil.
     ].
 
     "
@@ -2303,7 +2301,7 @@
      top windowGroup focusView:v1.
     "
 
-    "Modified: / 20.5.1999 / 18:30:16 / cg"
+    "Modified: / 08-11-2006 / 12:13:48 / cg"
 !
 
 pointerView
@@ -2789,7 +2787,7 @@
 !WindowGroup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.282 2006-08-29 12:50:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.283 2006-11-08 11:14:08 cg Exp $'
 ! !
 
 WindowGroup initialize!