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

48
src/html/chm.cpp
View File

@@ -103,7 +103,7 @@ wxChmTools::wxChmTools(const wxFileName &archive)
{
m_chmFileName = archive.GetFullPath();
wxASSERT_MSG( !m_chmFileName.empty(), _T("empty archive name") );
wxASSERT_MSG( !m_chmFileName.empty(), wxT("empty archive name") );
m_archive = NULL;
m_decompressor = NULL;
@@ -435,7 +435,7 @@ wxChmInputStream::wxChmInputStream(const wxString& archive,
// if the file could not be located, but was *.hhp, than we create
// the content of the hhp-file on the fly and store it for reading
// by the application
if ( m_fileName.Find(_T(".hhp")) != wxNOT_FOUND && m_simulateHHP )
if ( m_fileName.Find(wxT(".hhp")) != wxNOT_FOUND && m_simulateHHP )
{
// now we open an hhp-file
CreateHHPStream();
@@ -572,7 +572,7 @@ wxChmInputStream::CreateHHPStream()
// Try to open the #SYSTEM-File and create the HHP File out of it
// see http://bonedaddy.net/pabs3/chmspec/0.1.2/Internal.html#SYSTEM
if ( ! m_chm->Contains(_T("/#SYSTEM")) )
if ( ! m_chm->Contains(wxT("/#SYSTEM")) )
{
#ifdef DEBUG
wxLogDebug("Archive doesn't contain #SYSTEM file");
@@ -581,10 +581,10 @@ wxChmInputStream::CreateHHPStream()
}
else
{
file = wxFileName(_T("/#SYSTEM"));
file = wxFileName(wxT("/#SYSTEM"));
}
if ( CreateFileStream(_T("/#SYSTEM")) )
if ( CreateFileStream(wxT("/#SYSTEM")) )
{
// New stream for writing a memory area to simulate the
// .hhp-file
@@ -650,7 +650,7 @@ wxChmInputStream::CreateHHPStream()
wxUint32 dummy = *((wxUint32 *)(structptr+0)) ;
wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
wxString msg ;
msg.Printf(_T("Language=0x%X\r\n"),lcid) ;
msg.Printf(wxT("Language=0x%X\r\n"),lcid) ;
out->Write(msg.c_str() , msg.length() ) ;
}
break ;
@@ -676,13 +676,13 @@ wxChmInputStream::CreateHHPStream()
free (m_content);
// Now add entries which are missing
if ( !hhc && m_chm->Contains(_T("*.hhc")) )
if ( !hhc && m_chm->Contains(wxT("*.hhc")) )
{
tmp = "Contents File=*.hhc\r\n";
out->Write((const void *) tmp, strlen(tmp));
}
if ( !hhk && m_chm->Contains(_T("*.hhk")) )
if ( !hhk && m_chm->Contains(wxT("*.hhk")) )
{
tmp = "Index File=*.hhk\r\n";
out->Write((const void *) tmp, strlen(tmp));
@@ -710,7 +710,7 @@ wxChmInputStream::CreateHHPStream()
bool wxChmInputStream::CreateFileStream(const wxString& pattern)
{
wxFileInputStream * fin;
wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm"));
wxString tmpfile = wxFileName::CreateTempFileName(wxT("chmstrm"));
if ( tmpfile.empty() )
{
@@ -795,8 +795,8 @@ wxChmFSHandler::~wxChmFSHandler()
bool wxChmFSHandler::CanOpen(const wxString& location)
{
wxString p = GetProtocol(location);
return (p == _T("chm")) &&
(GetProtocol(GetLeftLocation(location)) == _T("file"));
return (p == wxT("chm")) &&
(GetProtocol(GetLeftLocation(location)) == wxT("file"));
}
wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
@@ -809,7 +809,7 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
int index;
if ( GetProtocol(left) != _T("file") )
if ( GetProtocol(left) != wxT("file") )
{
wxLogError(_("CHM handler currently supports only local files!"));
return NULL;
@@ -817,21 +817,21 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
// Work around javascript
wxString tmp = wxString(right);
if ( tmp.MakeLower().Contains(_T("javascipt")) && tmp.Contains(_T("\'")) )
if ( tmp.MakeLower().Contains(wxT("javascipt")) && tmp.Contains(wxT("\'")) )
{
right = right.AfterFirst(_T('\'')).BeforeLast(_T('\''));
right = right.AfterFirst(wxT('\'')).BeforeLast(wxT('\''));
}
// now work on the right location
if (right.Contains(_T("..")))
if (right.Contains(wxT("..")))
{
wxFileName abs(right);
abs.MakeAbsolute(_T("/"));
abs.MakeAbsolute(wxT("/"));
right = abs.GetFullPath();
}
// a workaround for absolute links to root
if ( (index=right.Index(_T("//"))) != wxNOT_FOUND )
if ( (index=right.Index(wxT("//"))) != wxNOT_FOUND )
{
right=wxString(right.Mid(index+1));
wxLogWarning(_("Link contained '//', converted to absolute link."));
@@ -845,7 +845,7 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
if ( s )
{
return new wxFSFile(s,
left + _T("#chm:") + right,
left + wxT("#chm:") + right,
wxEmptyString,
GetAnchor(location),
wxDateTime(wxFileModificationTime(left)));
@@ -866,24 +866,24 @@ wxString wxChmFSHandler::FindFirst(const wxString& spec, int flags)
wxString left = GetLeftLocation(spec);
wxString nativename = wxFileSystem::URLToFileName(left).GetFullPath();
if ( GetProtocol(left) != _T("file") )
if ( GetProtocol(left) != wxT("file") )
{
wxLogError(_("CHM handler currently supports only local files!"));
return wxEmptyString;
}
m_chm = new wxChmTools(wxFileName(nativename));
m_pattern = right.AfterLast(_T('/'));
m_pattern = right.AfterLast(wxT('/'));
wxString m_found = m_chm->Find(m_pattern);
// now fake around hhp-files which are not existing in projects...
if (m_found.empty() &&
m_pattern.Contains(_T(".hhp")) &&
!m_pattern.Contains(_T(".hhp.cached")))
m_pattern.Contains(wxT(".hhp")) &&
!m_pattern.Contains(wxT(".hhp.cached")))
{
m_found.Printf(_T("%s#chm:%s.hhp"),
left.c_str(), m_pattern.BeforeLast(_T('.')).c_str());
m_found.Printf(wxT("%s#chm:%s.hhp"),
left.c_str(), m_pattern.BeforeLast(wxT('.')).c_str());
}
return m_found;

2
src/html/helpctrl.cpp
View File

@@ -184,7 +184,7 @@ wxWindow* wxHtmlHelpController::CreateHelpWindow()
{
m_Config = wxConfigBase::Get(false);
if (m_Config != NULL)
m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
m_ConfigRoot = wxT("wxWindows/wxHtmlHelpController");
}
if (m_FrameStyle & wxHF_DIALOG)

56
src/html/helpdata.cpp
View File

@@ -51,11 +51,11 @@ static const wxChar* ReadLine(const wxChar *line, wxChar *buf, size_t bufsize)
wxChar *endptr = buf + bufsize - 1;
const wxChar *readptr = line;
while (*readptr != 0 && *readptr != _T('\r') && *readptr != _T('\n') &&
while (*readptr != 0 && *readptr != wxT('\r') && *readptr != wxT('\n') &&
writeptr != endptr)
*(writeptr++) = *(readptr++);
*writeptr = 0;
while (*readptr == _T('\r') || *readptr == _T('\n'))
while (*readptr == wxT('\r') || *readptr == wxT('\n'))
readptr++;
if (*readptr == 0)
return NULL;
@@ -255,7 +255,7 @@ wxString wxHtmlHelpDataItem::GetIndentedName() const
{
wxString s;
for (int i = 1; i < level; i++)
s << _T(" ");
s << wxT(" ");
s << name;
return s;
}
@@ -476,10 +476,10 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
else
{
if (wxIsAbsolutePath(path)) m_tempPath = path;
else m_tempPath = wxGetCwd() + _T("/") + path;
else m_tempPath = wxGetCwd() + wxT("/") + path;
if (m_tempPath[m_tempPath.length() - 1] != _T('/'))
m_tempPath << _T('/');
if (m_tempPath[m_tempPath.length() - 1] != wxT('/'))
m_tempPath << wxT('/');
}
}
@@ -674,16 +674,16 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
for (wxChar *ch = linebuf; *ch != wxT('\0') && *ch != wxT('='); ch++)
*ch = (wxChar)wxTolower(*ch);
if (wxStrstr(linebuf, _T("title=")) == linebuf)
title = linebuf + wxStrlen(_T("title="));
if (wxStrstr(linebuf, _T("default topic=")) == linebuf)
start = linebuf + wxStrlen(_T("default topic="));
if (wxStrstr(linebuf, _T("index file=")) == linebuf)
index = linebuf + wxStrlen(_T("index file="));
if (wxStrstr(linebuf, _T("contents file=")) == linebuf)
contents = linebuf + wxStrlen(_T("contents file="));
if (wxStrstr(linebuf, _T("charset=")) == linebuf)
charset = linebuf + wxStrlen(_T("charset="));
if (wxStrstr(linebuf, wxT("title=")) == linebuf)
title = linebuf + wxStrlen(wxT("title="));
if (wxStrstr(linebuf, wxT("default topic=")) == linebuf)
start = linebuf + wxStrlen(wxT("default topic="));
if (wxStrstr(linebuf, wxT("index file=")) == linebuf)
index = linebuf + wxStrlen(wxT("index file="));
if (wxStrstr(linebuf, wxT("contents file=")) == linebuf)
contents = linebuf + wxStrlen(wxT("contents file="));
if (wxStrstr(linebuf, wxT("charset=")) == linebuf)
charset = linebuf + wxStrlen(wxT("charset="));
} while (lineptr != NULL);
wxFontEncoding enc = wxFONTENCODING_SYSTEM;
@@ -844,11 +844,11 @@ bool wxHtmlSearchStatus::Search()
{
const wxChar *p1, *p2;
for (p1 = thepage.c_str(), p2 = m_LastPage.c_str();
*p1 != 0 && *p1 != _T('#') && *p1 == *p2; p1++, p2++) {}
*p1 != 0 && *p1 != wxT('#') && *p1 == *p2; p1++, p2++) {}
m_LastPage = thepage;
if (*p1 == 0 || *p1 == _T('#'))
if (*p1 == 0 || *p1 == wxT('#'))
return false;
}
else m_LastPage = thepage;
@@ -892,7 +892,7 @@ void wxHtmlSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, b
static inline bool WHITESPACE(wxChar c)
{
return c == _T(' ') || c == _T('\n') || c == _T('\r') || c == _T('\t');
return c == wxT(' ') || c == wxT('\n') || c == wxT('\r') || c == wxT('\t');
}
// replace continuous spaces by one single space
@@ -911,7 +911,7 @@ static inline wxString CompressSpaces(const wxString & str)
{
continue;
}
ch = _T(' ');
ch = wxT(' ');
space_counted = true;
}
else
@@ -943,19 +943,19 @@ bool wxHtmlSearchEngine::Scan(const wxFSFile& file)
wxChar c = *pBufStr;
if (insideTag)
{
if (c == _T('>'))
if (c == wxT('>'))
{
insideTag = false;
// replace the tag by an empty space
c = _T(' ');
c = wxT(' ');
}
else
continue;
}
else if (c == _T('<'))
else if (c == wxT('<'))
{
wxChar nextCh = *(pBufStr + 1);
if (nextCh == _T('/') || !WHITESPACE(nextCh))
if (nextCh == wxT('/') || !WHITESPACE(nextCh))
{
insideTag = true;
continue;
@@ -971,10 +971,10 @@ bool wxHtmlSearchEngine::Scan(const wxFSFile& file)
if (m_WholeWords)
{
// insert ' ' at the beginning and at the end
keyword.insert( 0, _T(" ") );
keyword.append( _T(" ") );
bufStr.insert( 0, _T(" ") );
bufStr.append( _T(" ") );
keyword.insert( 0, wxT(" ") );
keyword.append( wxT(" ") );
bufStr.insert( 0, wxT(" ") );
bufStr.append( wxT(" ") );
}
// remove continuous spaces

36
src/html/helpwnd.cpp
View File

@@ -184,7 +184,7 @@ void wxHtmlHelpWindow::UpdateMergedIndex()
for (size_t i = 0; i < len; i++)
{
const wxHtmlHelpDataItem& item = items[i];
wxASSERT_MSG( item.level < 128, _T("nested index entries too deep") );
wxASSERT_MSG( item.level < 128, wxT("nested index entries too deep") );
if (history[item.level] &&
history[item.level]->items[0]->name == item.name)
@@ -910,7 +910,7 @@ bool wxHtmlHelpWindow::KeywordSearch(const wxString& keyword,
switch ( mode )
{
default:
wxFAIL_MSG( _T("unknown help search mode") );
wxFAIL_MSG( wxT("unknown help search mode") );
// fall back
case wxHELP_SEARCH_ALL:
@@ -1077,7 +1077,7 @@ void wxHtmlHelpWindow::ReadCustomization(wxConfigBase *cfg, const wxString& path
if (path != wxEmptyString)
{
oldpath = cfg->GetPath();
cfg->SetPath(_T("/") + path);
cfg->SetPath(wxT("/") + path);
}
m_Cfg.navig_on = cfg->Read(wxT("hcNavigPanel"), m_Cfg.navig_on) != 0;
@@ -1135,7 +1135,7 @@ void wxHtmlHelpWindow::WriteCustomization(wxConfigBase *cfg, const wxString& pat
if (path != wxEmptyString)
{
oldpath = cfg->GetPath();
cfg->SetPath(_T("/") + path);
cfg->SetPath(wxT("/") + path);
}
cfg->Write(wxT("hcNavigPanel"), m_Cfg.navig_on);
@@ -1215,7 +1215,7 @@ public:
0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
wxDefaultSize, wxSP_ARROW_KEYS, 2, 100, 2, _T("wxSpinCtrl")));
wxDefaultSize, wxSP_ARROW_KEYS, 2, 100, 2, wxT("wxSpinCtrl")));
topsizer->Add(sizer, 0, wxLEFT|wxRIGHT|wxTOP, 10);
@@ -1251,25 +1251,25 @@ public:
wxString content(_("font size"));
content = _T("<font size=-2>") + content + _T(" -2</font><br>")
_T("<font size=-1>") + content + _T(" -1</font><br>")
_T("<font size=+0>") + content + _T(" +0</font><br>")
_T("<font size=+1>") + content + _T(" +1</font><br>")
_T("<font size=+2>") + content + _T(" +2</font><br>")
_T("<font size=+3>") + content + _T(" +3</font><br>")
_T("<font size=+4>") + content + _T(" +4</font><br>") ;
content = wxT("<font size=-2>") + content + wxT(" -2</font><br>")
wxT("<font size=-1>") + content + wxT(" -1</font><br>")
wxT("<font size=+0>") + content + wxT(" +0</font><br>")
wxT("<font size=+1>") + content + wxT(" +1</font><br>")
wxT("<font size=+2>") + content + wxT(" +2</font><br>")
wxT("<font size=+3>") + content + wxT(" +3</font><br>")
wxT("<font size=+4>") + content + wxT(" +4</font><br>") ;
content = wxString( _T("<html><body><table><tr><td>") ) +
content = wxString( wxT("<html><body><table><tr><td>") ) +
_("Normal face<br>and <u>underlined</u>. ") +
_("<i>Italic face.</i> ") +
_("<b>Bold face.</b> ") +
_("<b><i>Bold italic face.</i></b><br>") +
content +
wxString( _T("</td><td><tt>") ) +
wxString( wxT("</td><td><tt>") ) +
_("Fixed size face.<br> <b>bold</b> <i>italic</i> ") +
_("<b><i>bold italic <u>underlined</u></i></b><br>") +
content +
_T("</tt></td></tr></table></body></html>");
wxT("</tt></td></tr></table></body></html>");
TestWin->SetPage( content );
}
@@ -1560,11 +1560,11 @@ void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
if (!s.empty())
{
wxString ext = s.Right(4).Lower();
if (ext == _T(".zip") || ext == _T(".htb") ||
if (ext == wxT(".zip") || ext == wxT(".htb") ||
#if wxUSE_LIBMSPACK
ext == _T(".chm") ||
ext == wxT(".chm") ||
#endif
ext == _T(".hhp"))
ext == wxT(".hhp"))
{
wxBusyCursor bcur;
m_Data->AddBook(s);

10
src/html/htmlcell.cpp
View File

@@ -150,7 +150,7 @@ bool wxHtmlCell::ProcessMouseClick(wxHtmlWindowInterface *window,
const wxPoint& pos,
const wxMouseEvent& event)
{
wxCHECK_MSG( window, false, _T("window interface must be provided") );
wxCHECK_MSG( window, false, wxT("window interface must be provided") );
#if WXWIN_COMPATIBILITY_2_6
// NB: this hack puts the body of ProcessMouseClick() into OnMouseClick()
@@ -164,7 +164,7 @@ bool wxHtmlCell::ProcessMouseClick(wxHtmlWindowInterface *window,
void wxHtmlCell::OnMouseClick(wxWindow *, int, int, const wxMouseEvent& event)
{
wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") );
wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
const wxPoint& pos = gs_helperOnMouseClick->pos;
#endif // WXWIN_COMPATIBILITY_2_6
@@ -342,7 +342,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
}
}
wxFAIL_MSG(_T("Cells are in different trees"));
wxFAIL_MSG(wxT("Cells are in different trees"));
return false;
}
@@ -1392,7 +1392,7 @@ bool wxHtmlContainerCell::ProcessMouseClick(wxHtmlWindowInterface *window,
void wxHtmlContainerCell::OnMouseClick(wxWindow*,
int, int, const wxMouseEvent& event)
{
wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") );
wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
const wxPoint& pos = gs_helperOnMouseClick->pos;
#endif // WXWIN_COMPATIBILITY_2_6
@@ -1639,7 +1639,7 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc),
wxScrolledWindow *scrolwin =
wxDynamicCast(m_Wnd->GetParent(), wxScrolledWindow);
wxCHECK_RET( scrolwin,
_T("widget cells can only be placed in wxHtmlWindow") );
wxT("widget cells can only be placed in wxHtmlWindow") );
scrolwin->GetViewStart(&stx, &sty);
m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx,

4
src/html/htmlfilt.cpp
View File

@@ -145,7 +145,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
// tag if we used Content-Type header).
#if wxUSE_UNICODE
int charsetPos;
if ((charsetPos = file.GetMimeType().Find(_T("; charset="))) != wxNOT_FOUND)
if ((charsetPos = file.GetMimeType().Find(wxT("; charset="))) != wxNOT_FOUND)
{
wxString charset = file.GetMimeType().Mid(charsetPos + 10);
wxCSConv conv(charset);
@@ -175,7 +175,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
{
wxString hdr;
wxString mime = file.GetMimeType();
hdr.Printf(_T("<meta http-equiv=\"Content-Type\" content=\"%s\">"), mime.c_str());
hdr.Printf(wxT("<meta http-equiv=\"Content-Type\" content=\"%s\">"), mime.c_str());
return hdr+doc;
}
#endif

8
src/html/htmlfilter.cpp
View File

@@ -61,9 +61,9 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
doc = src;
delete [] src;
doc.Replace(_T("<"), _T("&lt;"), TRUE);
doc.Replace(_T(">"), _T("&gt;"), TRUE);
doc2 = _T("<HTML><BODY><PRE>\n") + doc + _T("\n</PRE></BODY></HTML>");
doc.Replace(wxT("<"), wxT("&lt;"), TRUE);
doc.Replace(wxT(">"), wxT("&gt;"), TRUE);
doc2 = wxT("<HTML><BODY><PRE>\n") + doc + wxT("\n</PRE></BODY></HTML>");
return doc2;
}
@@ -127,7 +127,7 @@ bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const
// This is true in most case but some page can return:
// "text/html; char-encoding=...."
// So we use Find instead
return (file.GetMimeType().Find(_T("text/html")) == 0);
return (file.GetMimeType().Find(wxT("text/html")) == 0);
}

16
src/html/htmlpars.cpp
View File

@@ -38,7 +38,7 @@
// DLL options compatibility check:
WX_CHECK_BUILD_OPTIONS("wxHTML")
const wxChar *wxTRACE_HTML_DEBUG = _T("htmldebug");
const wxChar *wxTRACE_HTML_DEBUG = wxT("htmldebug");
//-----------------------------------------------------------------------------
// wxHtmlParser helpers
@@ -915,18 +915,18 @@ private:
bool wxMetaTagHandler::HandleTag(const wxHtmlTag& 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();
@@ -955,7 +955,7 @@ bool
wxHtmlParser::SkipCommentTag(wxString::const_iterator& start,
wxString::const_iterator end)
{
wxASSERT_MSG( *start == '<', _T("should be called on the tag start") );
wxASSERT_MSG( *start == '<', wxT("should be called on the tag start") );
wxString::const_iterator p = start;

10
src/html/htmltag.cpp
View File

@@ -63,8 +63,8 @@ class wxHtmlTagsCacheData : public wxVector<wxHtmlCacheItem>
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);
}
bool wxIsCDATAElement(const wxString& tag)
@@ -103,7 +103,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
{
tagBuffer[i] = (wxChar)wxToupper(*pos);
}
tagBuffer[i] = _T('\0');
tagBuffer[i] = wxT('\0');
Cache()[tg].Name = new wxChar[i+1];
memcpy(Cache()[tg].Name, tagBuffer, (i+1)*sizeof(wxChar));
@@ -483,12 +483,12 @@ int wxHtmlTag::ScanParam(const wxString& par,
bool wxHtmlTag::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(wxS(name), false)) \

6
src/html/htmlwin.cpp
View File

@@ -247,7 +247,7 @@ bool wxHtmlWindowMouseHelper::OnCellClicked(wxHtmlCell *cell,
{
// if the event wasn't handled, do the default processing here:
wxASSERT_MSG( cell, _T("can't be called with NULL cell") );
wxASSERT_MSG( cell, wxT("can't be called with NULL cell") );
cell->ProcessMouseClick(m_interface, ev.GetPoint(), ev.GetMouseEvent());
}
@@ -964,7 +964,7 @@ bool wxHtmlWindow::CopySelection(ClipboardType t)
const wxString txt(SelectionToText());
wxTheClipboard->SetData(new wxTextDataObject(txt));
wxTheClipboard->Close();
wxLogTrace(_T("wxhtmlselection"),
wxLogTrace(wxT("wxhtmlselection"),
_("Copied to clipboard:\"%s\""), txt.c_str());
return true;
@@ -1403,7 +1403,7 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event)
// but seems to happen sometimes under wxMSW - maybe it's a bug
// there but for now just ignore it
//wxFAIL_MSG( _T("can't understand where has mouse gone") );
//wxFAIL_MSG( wxT("can't understand where has mouse gone") );
return;
}