Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Globally replace _T() with wxT().

Browse Source 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/filefn.cpp
View File

@@ -955,8 +955,8 @@ static void wxDoDos2UnixFilename(T *s)
if (s)
while (*s)
{
if (*s == _T('\\'))
*s = _T('/');
if (*s == wxT('\\'))
*s = wxT('/');
#ifdef __WXMSW__
else
*s = wxTolower(*s); // Case INDEPENDENT
@@ -1329,7 +1329,7 @@ bool wxDirExists(const wxString& pathName)
while ( wxEndsWithPathSeparator(strPath) )
{
size_t len = strPath.length();
if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )
if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) )
break;
strPath.Truncate(len - 1);
@@ -1338,8 +1338,8 @@ bool wxDirExists(const wxString& pathName)
#ifdef __OS2__
// OS/2 can't handle "d:", it wants either "d:\" or "d:."
if (strPath.length() == 2 && strPath[1u] == _T(':'))
strPath << _T('.');
if (strPath.length() == 2 && strPath[1u] == wxT(':'))
strPath << wxT('.');
#endif
#if defined(__WXPALMOS__)
@@ -1477,11 +1477,11 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
{
#if defined(__WXPALMOS__)
// TODO
if(buf && sz>0) buf[0] = _T('\0');
if(buf && sz>0) buf[0] = wxT('\0');
return buf;
#elif defined(__WXWINCE__)
// TODO
if(buf && sz>0) buf[0] = _T('\0');
if(buf && sz>0) buf[0] = wxT('\0');
return buf;
#else
if ( !buf )
@@ -1555,7 +1555,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
// sense at all to me - empty string is a better error indicator
// (NULL might be even better but I'm afraid this could lead to
// problems with the old code assuming the return is never NULL)
buf[0] = _T('\0');
buf[0] = wxT('\0');
}
else // ok, but we might need to massage the path into the right format
{
@@ -1613,7 +1613,7 @@ bool wxSetWorkingDirectory(const wxString& d)
#if defined(__OS2__)
if (d[1] == ':')
{
::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
::DosSetDefaultDisk(wxToupper(d[0]) - wxT('A') + 1);
// do not call DosSetCurrentDir when just changing drive,
// since it requires e.g. "d:." instead of "d:"!
if (d.length() == 2)
@@ -1686,7 +1686,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
{
// we assume that it's not empty
wxCHECK_MSG( !szFile.empty(), false,
_T("empty file name in wxFindFileInPath"));
wxT("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
wxString szFile2;
@@ -1767,7 +1767,7 @@ int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
}
else
{
wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
wxFAIL_MSG( wxT("missing '|' in the wildcard string!") );
}
break;
@@ -1818,13 +1818,13 @@ int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
{
wxString before = descriptions[k].Left(pos);
wxString after = descriptions[k].Mid(pos+filters[k].Len());
pos = before.Find(_T('('),true);
if (pos>before.Find(_T(')'),true))
pos = before.Find(wxT('('),true);
if (pos>before.Find(wxT(')'),true))
{
before = before.Left(pos+1);
before << filters[k];
pos = after.Find(_T(')'));
int pos1 = after.Find(_T('('));
pos = after.Find(wxT(')'));
int pos1 = after.Find(wxT('('));
if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
{
before << after.Mid(pos);