Don't ignore path when prompting for file in SaveAs()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 6c364c14382c1dc87e53d38129f4c51fe229055a..7f37a56f550004c905a9ad3929b9ae3cc328b22a 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -298,8 +298,12 @@ bool wxDocument::SaveAs()
 #else
     wxString filter = docTemplate->GetFileFilter() ;
 #endif
 #else
     wxString filter = docTemplate->GetFileFilter() ;
 #endif

+    wxString defaultDir = docTemplate->GetDirectory();
+    if (defaultDir.IsEmpty())
+        defaultDir = wxPathOnly(GetFilename());
+

     wxString tmp = wxFileSelector(_("Save As"),
     wxString tmp = wxFileSelector(_("Save As"),

-            docTemplate->GetDirectory(),
+            defaultDir,

             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
             filter,
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
             filter,