Globally replace _T() with wxT().
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:
@@ -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();
|
||||
|
Reference in New Issue
Block a user