--- a/FileDialog.st	Sun Mar 16 13:47:56 2003 +0100
+++ b/FileDialog.st	Mon Mar 17 14:38:27 2003 +0100
@@ -224,8 +224,10 @@
     ].
     enteredFileName := enteredFileNameString asFilename.
     enteredFileNameString := enteredFileName asString.
+
     (enteredFileName notNil 
     and:[enteredFileNameString notEmpty]) ifTrue:[
+        FileSelectionBox lastFileSelectionDirectory:(enteredFileName directoryName).
         versionSymbol isNil ifTrue:[ ^ enteredFileNameString].
         versionSymbol == #mustBeNew ifTrue:[
             "/ file may not exist
@@ -248,7 +250,6 @@
                 ifFalse:[^ ''].
             ].
         ].
-        FileSelectionBox lastFileSelectionDirectory:(enteredFileName directoryName).
     ].
     ^ enteredFileNameString
 "
@@ -1101,19 +1102,20 @@
     "filter keyboard events.
      Return true, if I have eaten the event"
 
-    |focusView key rawKey|
-
+"/    |focusView key rawKey|
+"/
     anEvent isKeyPressEvent ifTrue:[
-        focusView := anEvent targetView.
-        key := anEvent key.
-        rawKey := anEvent rawKey.
-
-        (focusView == filterField) ifTrue:[
-            ^ false.
-        ].
-        (focusView == filenameField) ifTrue:[
-            ^ false.
-        ].
+self halt.
+"/        focusView := anEvent targetView.
+"/        key := anEvent key.
+"/        rawKey := anEvent rawKey.
+"/
+"/        (focusView == filterField) ifTrue:[
+"/            ^ false.
+"/        ].
+"/        (focusView == filenameField) ifTrue:[
+"/            ^ false.
+"/        ].
     ].
     ^ false
 ! !
@@ -1176,7 +1178,21 @@
     and:[ev isKeyEvent 
     and:[ev key == #Return
     and:[(   ev targetView isSameOrComponentOf:filterField) 
-         or:[ev targetView isSameOrComponentOf:filenameField]]]]) ifTrue:[
+         or:[false "ev targetView isSameOrComponentOf:filenameField"]]]]) ifTrue:[
+        ^ true
+    ].
+    ^ false
+!
+
+returnWasPressedInFilterOrFilenameField
+    |ev|
+
+    ev := self windowGroup lastEvent.
+    (ev notNil 
+    and:[ev isKeyEvent 
+    and:[ev key == #Return
+    and:[(   ev targetView isSameOrComponentOf:filterField) 
+         or:[false "ev targetView isSameOrComponentOf:filenameField"]]]]) ifTrue:[
         ^ true
     ].
     ^ false
@@ -1202,7 +1218,6 @@
     self returnWasPressedInFilterField ifTrue:[
         ^ self
     ].
-
     appendWasPressed := false.
     self commonAcceptAction.
 !
@@ -1260,5 +1275,5 @@
 !FileDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.26 2003-02-27 17:15:06 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.27 2003-03-17 13:38:27 martin Exp $'
 ! !