many changes; major ones:
1. start of !wxUSE_GUI support 2. _T() macro renamed to T() 3. wxConvertWX2MB and MB2WX macro added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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) (DWORD)(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
|
||||
|
||||
|
Reference in New Issue
Block a user