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

2
interface/wx/aboutdlg.h
View File

@@ -189,7 +189,7 @@ public:
info.SetName(_("My Program"));
info.SetVersion(_("1.2.3 Beta"));
info.SetDescription(_("This program does something great."));
info.SetCopyright(_T("(C) 2007 Me <my@email.addre.ss>"));
info.SetCopyright(wxT("(C) 2007 Me <my@email.addre.ss>"));
wxAboutBox(info);
}

4
interface/wx/archive.h
View File

@@ -384,7 +384,7 @@ public:
const wxArchiveClassFactory *factory = wxArchiveClassFactory::GetFirst();
while (factory) {
list << factory->GetProtocol() << _T("\n");
list << factory->GetProtocol() << wxT("\n");
factory = factory->GetNext();
}
@endcode
@@ -421,7 +421,7 @@ public:
const wxChar *const *p;
for (p = factory->GetProtocols(wxSTREAM_FILEEXT); *p; p++)
list << *p << _T("\n");
list << *p << wxT("\n");
@endcode
*/
virtual const wxChar** GetProtocols(wxStreamProtocolType type = wxSTREAM_PROTOCOL) const = 0;

5
interface/wx/chartype.h
View File

@@ -60,7 +60,10 @@
Don't confuse this macro with _()!
Note that since wxWidgets 2.9.0 the use of _T() is discouraged just like for wxT().
Note that since wxWidgets 2.9.0 the use of _T() is discouraged just like
for wxT() and also that this macro may conflict with identifiers defined in
standard headers of some compilers (such as Sun CC) so its use should
really be avoided.
@header{wx/chartype.h}
*/

2
interface/wx/generic/spinctrg.h
View File

@@ -70,7 +70,7 @@ public:
long style = wxSP_ARROW_KEYS,
double min = 0, double max = 100,
double initial = 0, double inc = 1,
const wxString& name = _T("wxSpinCtrlDouble"));
const wxString& name = wxT("wxSpinCtrlDouble"));
/**
Creation function called by the spin control constructor.

2
interface/wx/html/helpwnd.h
View File

@@ -23,7 +23,7 @@
m_embeddedHtmlHelp.SetHelpWindow(m_embeddedHelpWindow);
m_embeddedHelpWindow->Create(this, wxID_ANY, wxDefaultPosition, GetClientSize(),
wxTAB_TRAVERSAL|wxBORDER_NONE, wxHF_DEFAULT_STYLE);
m_embeddedHtmlHelp.AddBook(wxFileName(_T("doc.zip")));
m_embeddedHtmlHelp.AddBook(wxFileName(wxT("doc.zip")));
@endcode
You should pass the style wxHF_EMBEDDED to the style parameter of

4
interface/wx/stream.h
View File

@@ -836,7 +836,7 @@ public:
const wxFilterClassFactory *factory = wxFilterClassFactory::GetFirst();
while (factory) {
list << factory->GetProtocol() << _T("\n");
list << factory->GetProtocol() << wxT("\n");
factory = factory->GetNext();
}
@endcode
@@ -866,7 +866,7 @@ public:
const wxChar *const *p;
for (p = factory->GetProtocols(wxSTREAM_FILEEXT); *p; p++)
list << *p << _T("\n");
list << *p << wxT("\n");
@endcode
*/
virtual const wxChar * const* GetProtocols(wxStreamProtocolType type = wxSTREAM_PROTOCOL) const = 0;