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

14
tests/benchmarks/htmlparser/htmlpars.cpp
View File

@@ -36,7 +36,7 @@
// DLL options compatibility check:
WX_CHECK_BUILD_OPTIONS("wxHTML")
const wxChar *wxTRACE_HTML_DEBUG = _T("htmldebug");
const wxChar *wxTRACE_HTML_DEBUG = wxT("htmldebug");
//-----------------------------------------------------------------------------
// wx28HtmlParser helpers
@@ -918,18 +918,18 @@ private:
bool wxMetaTagHandler::HandleTag(const wx28HtmlTag& tag)
{
if (tag.GetName() == _T("BODY"))
if (tag.GetName() == wxT("BODY"))
{
m_Parser->StopParsing();
return false;
}
if (tag.HasParam(_T("HTTP-EQUIV")) &&
tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) &&
tag.HasParam(_T("CONTENT")))
if (tag.HasParam(wxT("HTTP-EQUIV")) &&
tag.GetParam(wxT("HTTP-EQUIV")).IsSameAs(wxT("Content-Type"), false) &&
tag.HasParam(wxT("CONTENT")))
{
wxString content = tag.GetParam(_T("CONTENT")).Lower();
if (content.Left(19) == _T("text/html; charset="))
wxString content = tag.GetParam(wxT("CONTENT")).Lower();
if (content.Left(19) == wxT("text/html; charset="))
{
*m_retval = content.Mid(19);
m_Parser->StopParsing();

10
tests/benchmarks/htmlparser/htmltag.cpp
View File

@@ -52,8 +52,8 @@ IMPLEMENT_CLASS(wx28HtmlTagsCache,wxObject)
bool wxIsCDATAElement(const wxChar *tag)
{
return (wxStrcmp(tag, _T("SCRIPT")) == 0) ||
(wxStrcmp(tag, _T("STYLE")) == 0);
return (wxStrcmp(tag, wxT("SCRIPT")) == 0) ||
(wxStrcmp(tag, wxT("STYLE")) == 0);
}
wx28HtmlTagsCache::wx28HtmlTagsCache(const wxString& source)
@@ -85,7 +85,7 @@ wx28HtmlTagsCache::wx28HtmlTagsCache(const wxString& source)
{
tagBuffer[i] = (wxChar)wxToupper(src[pos]);
}
tagBuffer[i] = _T('\0');
tagBuffer[i] = wxT('\0');
m_Cache[tg].Name = new wxChar[i+1];
memcpy(m_Cache[tg].Name, tagBuffer, (i+1)*sizeof(wxChar));
@@ -409,12 +409,12 @@ int wx28HtmlTag::ScanParam(const wxString& par,
bool wx28HtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
{
wxCHECK_MSG( clr, false, _T("invalid colour argument") );
wxCHECK_MSG( clr, false, wxT("invalid colour argument") );
wxString str = GetParam(par);
// handle colours defined in HTML 4.0 first:
if (str.length() > 1 && str[0] != _T('#'))
if (str.length() > 1 && str[0] != wxT('#'))
{
#define HTML_COLOUR(name, r, g, b) \
if (str.IsSameAs(wxT(name), false)) \