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

10
src/xrc/xmlres.cpp
View File

@@ -292,13 +292,13 @@ bool wxXmlResource::Load(const wxString& filemask_)
bool wxXmlResource::Unload(const wxString& filename)
{
wxASSERT_MSG( !wxIsWild(filename),
_T("wildcards not supported by wxXmlResource::Unload()") );
wxT("wildcards not supported by wxXmlResource::Unload()") );
wxString fnd = ConvertFileNameToURL(filename);
#if wxUSE_FILESYSTEM
const bool isArchive = IsArchive(fnd);
if ( isArchive )
fnd += _T("#zip:");
fnd += wxT("#zip:");
#endif // wxUSE_FILESYSTEM
bool unloaded = false;
@@ -564,7 +564,7 @@ bool wxXmlResource::UpdateResources()
if (modif)
{
wxLogTrace(_T("xrc"), _T("opening file '%s'"), rec->File);
wxLogTrace(wxT("xrc"), wxT("opening file '%s'"), rec->File);
wxInputStream *stream = NULL;
@@ -1226,7 +1226,7 @@ static wxColour GetSystemColour(const wxString& name)
if (!name.empty())
{
#define SYSCLR(clr) \
if (name == _T(#clr)) return wxSystemSettings::GetColour(clr);
if (name == wxT(#clr)) return wxSystemSettings::GetColour(clr);
SYSCLR(wxSYS_COLOUR_SCROLLBAR)
SYSCLR(wxSYS_COLOUR_BACKGROUND)
SYSCLR(wxSYS_COLOUR_DESKTOP)
@@ -1688,7 +1688,7 @@ static wxFont GetSystemFont(const wxString& name)
if (!name.empty())
{
#define SYSFNT(fnt) \
if (name == _T(#fnt)) return wxSystemSettings::GetFont(fnt);
if (name == wxT(#fnt)) return wxSystemSettings::GetFont(fnt);
SYSFNT(wxSYS_OEM_FIXED_FONT)
SYSFNT(wxSYS_ANSI_FIXED_FONT)
SYSFNT(wxSYS_ANSI_VAR_FONT)