just to resolve a dummy conflict

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 33b30d58327dacf4c3a32a6be12b98c9fc01b1fb..13ecedef05ac315c96cb5157f54ee412bc8d117b 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1076,8 +1076,8 @@ bool wxDirExists(const wxString& dir)
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxPathExists(const wxChar *pszPathName)
 {
-  // Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists
-  // OTOH, we should change "d:" to "d:\" and leave "\" as is.
+  /* Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists
+   * OTOH, we should change "d:" to "d:\" and leave "\" as is. */
   wxString strPath(pszPathName);
   if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != _T('\0') )
     strPath.Last() = _T('\0');
@@ -1444,7 +1444,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
   }
 #if wxUSE_UNICODE
   else {
-    wxConv_file.MB2WC(buf, cbuf, sz);
+    wxConvFile.MB2WC(buf, cbuf, sz);
     delete [] cbuf;
   }
 #endif