Fix unintialized pointer in wxCommandProcessor when

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 674265b46280b8846b957e7e69cc1d408fb8bd4d..a5a5f853a820aaee3e2b000c9e1f5adb71b053d7 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -454,16 +454,16 @@ void wxFileName::Clear()
 }
 
 /* static */
-wxFileName wxFileName::FileName(const wxString& file)
+wxFileName wxFileName::FileName(const wxString& file, wxPathFormat format)
 {
-    return wxFileName(file);
+    return wxFileName(file, format);
 }
 
 /* static */
-wxFileName wxFileName::DirName(const wxString& dir)
+wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format)
 {
     wxFileName fn;
-    fn.AssignDir(dir);
+    fn.AssignDir(dir, format);
     return fn;
 }
 
@@ -998,7 +998,7 @@ bool wxFileName::IsAbsolute(wxPathFormat format) const
 
 bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
 {
-    wxFileName fnBase(pathBase, format);
+    wxFileName fnBase = wxFileName::DirName(pathBase, format);
 
     // get cwd only once - small time saving
     wxString cwd = wxGetCwd();