reverted rev 1.26, workarounds for memchecking code no longer needed

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 329a52695c2d485a3d746b5635800029612715bf..1f80781a6a72ad1ce6eb4d1cecc1714a5a831ae4 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1303,6 +1303,7 @@ bool wxRemoveFile(const wxString& file)
 #if defined(__VISUALC__) \
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \
+ || defined(__DMC__) \
  || defined(__GNUWIN32__)
   int res = wxRemove(file);
 #elif defined(__WXMAC__)
@@ -1396,7 +1397,7 @@ bool wxPathExists(const wxChar *pszPathName)
 
 #ifdef __OS2__
     // OS/2 can't handle "d:", it wants either "d:\" or "d:."
-    if (strPath.length() == 2 && strPath[1] == _T(':'))
+    if (strPath.length() == 2 && strPath[1u] == _T(':'))
         strPath << _T('.');
 #endif
 
@@ -1591,7 +1592,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 
-    #if wxUSE_UNICODE && !defined(__WXMAC__)
+    #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
         // finally convert the result to Unicode if needed
         wxConvFile.MB2WC(buf, cbuf, sz);
     #endif // wxUSE_UNICODE