--- a/DialogBox.st	Thu Feb 20 12:51:40 1997 +0100
+++ b/DialogBox.st	Thu Feb 20 18:16:49 1997 +0100
@@ -1402,7 +1402,7 @@
         pattern:'*.st'   
     "
 
-    "Modified: 19.4.1996 / 14:06:22 / cg"
+    "Modified: 20.2.1997 / 18:13:13 / cg"
 !
 
 requestFileName:titleString default:defaultName ok:okText abort:abortText pattern:pattern fromDirectory:aDirectoryPath
@@ -1413,7 +1413,16 @@
      The matchPattern is set to pattern initially.
      Return the string, or nil if cancel was pressed."
 
-    |box|
+    |box defaultDir defaultNm|
+
+    defaultNm := defaultName.
+    defaultDir := aDirectoryPath.
+    defaultDir isNil ifTrue:[
+        defaultNm notNil ifTrue:[
+            defaultDir := defaultName asFilename directoryName.
+            defaultNm := defaultNm asFilename baseName.
+        ].
+    ].
 
     box := FileSelectionBox 
                title:titleString
@@ -1421,9 +1430,9 @@
                abortText:abortText
                action:[:fileName | box destroy. ^ fileName].
 
-    aDirectoryPath notNil ifTrue:[box directory:aDirectoryPath].
+    defaultDir notNil ifTrue:[box directory:defaultDir].
     box pattern:pattern.
-    box initialText:defaultName.
+    box initialText:defaultNm.
     box showAtPointer.
     box action:nil.
     box destroy.
@@ -1439,7 +1448,7 @@
         fromDirectory:'/etc'  
     "
 
-    "Modified: 29.5.1996 / 15:25:40 / cg"
+    "Modified: 20.2.1997 / 18:12:49 / cg"
 !
 
 requestFileName:titleString default:defaultName version:versionSymbol
@@ -1528,11 +1537,20 @@
         #any (other)    - no validation
     "
 
-    |box|
+    |box defaultDir defaultNm|
+
+    defaultNm := defaultName.
+    defaultDir := aDirectoryPath.
+    defaultDir isNil ifTrue:[
+        defaultNm notNil ifTrue:[
+            defaultDir := defaultName asFilename directoryName.
+            defaultNm := defaultNm asFilename baseName.
+        ].
+    ].
 
     box := FileSelectionBox title:titleString.
-    aDirectoryPath notNil ifTrue:[box directory:aDirectoryPath].
-    box initialText:defaultName.
+    defaultDir notNil ifTrue:[box directory:defaultDir].
+    box initialText:defaultNm.
     box action:[:name | 
         versionSymbol == #mustBeNew ifTrue:[
             "/ file may not exist
@@ -1588,7 +1606,7 @@
         fromDirectory:'/etc'
     "
 
-    "Modified: 29.5.1996 / 15:25:57 / cg"
+    "Modified: 20.2.1997 / 18:12:28 / cg"
 !
 
 requestFileName:titleString ifFail:cancelBlock
@@ -5336,6 +5354,6 @@
 !DialogBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.101 1997-02-13 19:27:24 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.102 1997-02-20 17:16:49 cg Exp $'
 ! !
 DialogBox initialize!