X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a1e0e91a1ca5ec98b0eeb335cda757d1261ed08..c1a4ce66a6d0f5830bd80573963dc072f81e6813:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index c2614443c7..22f0636f92 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -558,7 +558,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
     buf[0] = wxT('\0');
     if (name.empty())
         return buf;
-    nm = MYcopystring((const CharType*)name.c_str()); // Make a scratch copy
+    nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy
     CharType *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */
@@ -1647,10 +1647,10 @@ bool wxSetWorkingDirectory(const wxString& d)
     if (d[1] == ':')
     {
         ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
-	// do not call DosSetCurrentDir when just changing drive,
-	// since it requires e.g. "d:." instead of "d:"!
-	if (d.length() == 2)
-	    return true;
+    // do not call DosSetCurrentDir when just changing drive,
+    // since it requires e.g. "d:." instead of "d:"!
+    if (d.length() == 2)
+        return true;
     }
     return (::DosSetCurrentDir(d.c_str()) == 0);
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
@@ -1915,7 +1915,7 @@ bool wxIsWritable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
-    return access(path.fn_str(), W_OK) == 0;
+    return wxAccess(path.c_str(), W_OK) == 0;
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_WRITE);
 #else
@@ -1929,7 +1929,7 @@ bool wxIsReadable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
-    return access(path.fn_str(), R_OK) == 0;
+    return wxAccess(path.c_str(), R_OK) == 0;
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_READ);
 #else
@@ -1943,7 +1943,7 @@ bool wxIsExecutable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
-    return access(path.fn_str(), X_OK) == 0;
+    return wxAccess(path.c_str(), X_OK) == 0;
 #elif defined( __WINDOWS__ )
    return wxCheckWin32Permission(path, GENERIC_EXECUTE);
 #else