X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2ff79b17b1f3e8117e23179340cf69a85b5fe61..f7a11f8c8e665992e2d1956b2b89d2f562c92669:/src/common/file.cpp?ds=sidebyside

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 6b65c35e82..83d73611a0 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -169,7 +169,7 @@ bool wxFile::Exists(const wxChar *name)
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 
     return !access(fname, 0) &&
-           !stat(MBSTRINGCAST fname, &st) &&
+           !stat(wxMBSTRINGCAST fname, &st) &&
            (st.st_mode & S_IFREG);
 #else
     return !access(name, 0) &&
@@ -192,7 +192,7 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             break;
 
         default:
-            wxFAIL_MSG(_T("bad wxFile::Access mode parameter."));
+            wxFAIL_MSG(T("bad wxFile::Access mode parameter."));
     }
 
     return access(wxFNCONV(name), how) == 0;
@@ -481,28 +481,29 @@ bool wxTempFile::Open(const wxString& strName)
     // different partitions for example). Unfortunately, the only standard
     // (POSIX) temp file creation function tmpnam() can't do it.
 #if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )
-    static const wxChar *szMktempSuffix = _T("XXXXXX");
+    static const wxChar *szMktempSuffix = T("XXXXXX");
     m_strTemp << strName << szMktempSuffix;
-    mktemp(MBSTRINGCAST m_strTemp.mb_str()); // will do because length doesn't change
+    // can use the cast because length doesn't change
+    mktemp(wxMBSTRINGCAST m_strTemp.mb_str());
 #elif  defined(__WXPM__)
     // for now just create a file
     // future enhancements can be to set some extended attributes for file systems
     // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
-    static const wxChar *szMktempSuffix = _T("XXX");
+    static const wxChar *szMktempSuffix = T("XXX");
     m_strTemp << strName << szMktempSuffix;
     mkdir(m_strTemp.GetWriteBuf(MAX_PATH));
 #else // Windows
     wxString strPath;
     wxSplitPath(strName, &strPath, NULL, NULL);
     if ( strPath.IsEmpty() )
-        strPath = _T('.');  // GetTempFileName will fail if we give it empty string
+        strPath = T('.');  // GetTempFileName will fail if we give it empty string
 #ifdef __WIN32__
-    if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+    if ( !GetTempFileName(strPath, T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
 #else
         // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
-        if ( !GetTempFileName((BYTE) (const wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+        if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
 #endif
-            wxLogLastError(_T("GetTempFileName"));
+            wxLogLastError(T("GetTempFileName"));
     m_strTemp.UngetWriteBuf();
 #endif  // Windows/Unix