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

20
src/common/zipstrm.cpp
View File

@@ -151,9 +151,9 @@ wxZipClassFactory::wxZipClassFactory()
const wxChar * const *
wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const
{
static const wxChar *protocols[] = { _T("zip"), NULL };
static const wxChar *mimetypes[] = { _T("application/zip"), NULL };
static const wxChar *fileexts[] = { _T(".zip"), _T(".htb"), NULL };
static const wxChar *protocols[] = { wxT("zip"), NULL };
static const wxChar *mimetypes[] = { wxT("application/zip"), NULL };
static const wxChar *fileexts[] = { wxT(".zip"), wxT(".htb"), NULL };
static const wxChar *empty[] = { NULL };
switch (type) {
@@ -200,7 +200,7 @@ wxZipHeader::wxZipHeader(wxInputStream& stream, size_t size)
m_pos(0),
m_ok(false)
{
wxCHECK_RET(size <= sizeof(m_data), _T("buffer too small"));
wxCHECK_RET(size <= sizeof(m_data), wxT("buffer too small"));
m_size = stream.Read(m_data, size).LastRead();
m_ok = m_size == size;
}
@@ -786,15 +786,15 @@ wxString wxZipEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const
switch (wxFileName::GetFormat(format)) {
case wxPATH_DOS:
{
wxString name(isDir ? m_Name + _T("\\") : m_Name);
wxString name(isDir ? m_Name + wxT("\\") : m_Name);
for (size_t i = 0; i < name.length(); i++)
if (name[i] == _T('/'))
name[i] = _T('\\');
if (name[i] == wxT('/'))
name[i] = wxT('\\');
return name;
}
case wxPATH_UNIX:
return isDir ? m_Name + _T("/") : m_Name;
return isDir ? m_Name + wxT("/") : m_Name;
default:
;
@@ -834,9 +834,9 @@ wxString wxZipEntry::GetInternalName(const wxString& name,
while (!internal.empty() && *internal.begin() == '/')
internal.erase(0, 1);
while (!internal.empty() && internal.compare(0, 2, _T("./")) == 0)
while (!internal.empty() && internal.compare(0, 2, wxT("./")) == 0)
internal.erase(0, 2);
if (internal == _T(".") || internal == _T(".."))
if (internal == wxT(".") || internal == wxT(".."))
internal = wxEmptyString;
return internal;