--- a/FileBrowserV2.st	Wed Sep 17 01:33:09 2003 +0200
+++ b/FileBrowserV2.st	Wed Sep 17 10:42:26 2003 +0200
@@ -1237,7 +1237,6 @@
 !FileBrowserV2 methodsFor:'change & update'!
 
 currentFileNameHolderChanged
-
     |newEntryValue nSelected files volume|
 
     files := self currentFileNameHolder value.
@@ -1254,15 +1253,17 @@
     ].
     self fileEntryFieldHolder value:(newEntryValue asString) withoutNotifying:self.
 
-    OperatingSystem isMSWINDOWSlike ifTrue:[
-        volume := (nSelected >= 1) ifTrue:[files first volume] ifFalse:nil.    
+    "/ OperatingSystem isMSWINDOWSlike ifTrue:[
+        volume := (nSelected >= 1) 
+                    ifTrue:[files first volume] 
+                    ifFalse:nil.    
         self selectedDeviceDrive value:volume.
-    ].
+    "/ ].
     self updatePreview.
 !
 
 fileEntryFieldHolderChanged
-    |fileName fileNameString answer|
+    |fileName fileNameString answer dir|
 
     fileNameString := fileEntryFieldHolder value withoutSeparators.
     fileName := fileNameString asFilename.
@@ -1270,6 +1271,17 @@
     (fileName exists) ifFalse:[ 
         pathEntryField flash.
 
+        dir := fileName directory.
+        dir exists ifTrue:[
+            self currentFileNameHolder 
+                value:(OrderedCollection with:dir)
+                withoutNotifying:self.
+        ].
+        fileName baseName includesMatchCharacters ifTrue:[
+            self fileEntryFieldHolder value:(fileName directoryName) withoutNotifying:self.
+            self filterModel value:fileName baseName.
+        ].
+
 "/        answer := OptionBox 
 "/           request:(resources string:'No file or directory named "%1" exists.\\Create ?' with:fileNameString allBold) withCRs
 "/           buttonLabels:#('Create as File' 'Create as Directory' 'Cancel')
@@ -1279,6 +1291,7 @@
         answer isNil ifTrue:[
             ^ self.
         ].
+
         [
             answer == #createFile ifTrue:[
                 fileName directory recursiveMakeDirectory.
@@ -1597,7 +1610,7 @@
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.90 2003-09-10 10:13:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.91 2003-09-17 08:42:26 cg Exp $'
 ! !
 
 FileBrowserV2 initialize!