fixed memory leak in RestoreState

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 5786749e8314ddbc4c141bca4e9c1d08884e19c2..baeec9ec91da8951143f768b4cd30ed71edaa043 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1646,11 +1646,11 @@ bool wxSetWorkingDirectory(const wxString& d)
 #if defined(__OS2__)
     if (d[1] == ':')
     {
-        ::DosSetDefaultDisk(1 + wxToupper(d[0]) - _T('A'));
-       // do not call DosSetCurrentDir when just changing drive,
-       // since it requires e.g. "d:." instead of "d:"!
-       if (d.length() == 2)
-           return true;
+        ::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;
     }
     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