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

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);