--- a/EditField.st	Tue Mar 16 14:04:59 1999 +0100
+++ b/EditField.st	Tue Mar 16 14:35:06 1999 +0100
@@ -1529,6 +1529,9 @@
         ].
 
         leaveAction notNil ifTrue:[
+            leaveAction numArgs == 2 ifTrue:[
+                ^ leaveAction value:self value:key
+            ].
             ^ leaveAction value:key
         ].
 
@@ -1546,11 +1549,13 @@
         "/ forward it as a Focus-step
         key == #CursorDown ifTrue:[
             "/ forward it as a Focus-step
-            ^ super keyPress:#FocusNext x:x y:y
+            ^ self windowGroup focusNext.
+"/            ^ super keyPress:#FocusNext x:x y:y
         ].
         key == #CursorUp ifTrue:[
             "/ forward it as a Focus-step
-            ^ super keyPress:#FocusPrevious x:x y:y
+            ^ self windowGroup focusPrevious.
+"/            ^ super keyPress:#FocusPrevious x:x y:y
         ].
         ^ self
     ].
@@ -2019,5 +2024,5 @@
 !EditField class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.118 1999-03-14 13:06:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.119 1999-03-16 13:35:06 cg Exp $'
 ! !