added wxString ctor from std::string (inside #ifdef wxUSE_STD_STRING); removed pragma...

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 46ce327c19c6ccc23d1607e9a00733cdd40d46b0..7582c0ef107cb14f47dd3a1288f310eb381ff184 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -452,7 +452,8 @@ void wxFileName::Assign(const wxString& fullpathOrig,
                   _T("the path shouldn't contain file name nor extension") );
 
 #else // !__WXDEBUG__
-    SplitPath(fullname, NULL /* no path */, &name, &ext, &hasExt, format);
+    SplitPath(fullname, NULL /* no volume */, NULL /* no path */,
+                        &name, &ext, &hasExt, format);
     SplitPath(fullpath, &volume, &path, NULL, NULL, format);
 #endif // __WXDEBUG__/!__WXDEBUG__
 
@@ -526,7 +527,7 @@ bool wxFileName::DirExists() const
 
 bool wxFileName::DirExists( const wxString &dir )
 {
-    return ::wxDirExists( dir );
+    return ::wxPathExists( dir );
 }
 
 // ----------------------------------------------------------------------------