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:
@@ -57,55 +57,55 @@ void FontMapperTestCase::NamesAndDesc()
|
||||
static const wxChar *charsets[] =
|
||||
{
|
||||
// some valid charsets
|
||||
_T("us-ascii" ),
|
||||
_T("iso8859-1" ),
|
||||
_T("iso-8859-12" ),
|
||||
_T("koi8-r" ),
|
||||
_T("utf-7" ),
|
||||
_T("cp1250" ),
|
||||
_T("windows-1252"),
|
||||
wxT("us-ascii" ),
|
||||
wxT("iso8859-1" ),
|
||||
wxT("iso-8859-12" ),
|
||||
wxT("koi8-r" ),
|
||||
wxT("utf-7" ),
|
||||
wxT("cp1250" ),
|
||||
wxT("windows-1252"),
|
||||
|
||||
// and now some bogus ones
|
||||
_T("" ),
|
||||
_T("cp1249" ),
|
||||
_T("iso--8859-1" ),
|
||||
_T("iso-8859-19" ),
|
||||
wxT("" ),
|
||||
wxT("cp1249" ),
|
||||
wxT("iso--8859-1" ),
|
||||
wxT("iso-8859-19" ),
|
||||
};
|
||||
|
||||
static const wxChar *names[] =
|
||||
{
|
||||
// some valid charsets
|
||||
_T("default" ),
|
||||
_T("iso-8859-1" ),
|
||||
_T("iso-8859-12" ),
|
||||
_T("koi8-r" ),
|
||||
_T("utf-7" ),
|
||||
_T("windows-1250"),
|
||||
_T("windows-1252"),
|
||||
wxT("default" ),
|
||||
wxT("iso-8859-1" ),
|
||||
wxT("iso-8859-12" ),
|
||||
wxT("koi8-r" ),
|
||||
wxT("utf-7" ),
|
||||
wxT("windows-1250"),
|
||||
wxT("windows-1252"),
|
||||
|
||||
// and now some bogus ones
|
||||
_T("default" ),
|
||||
_T("unknown--1" ),
|
||||
_T("unknown--1" ),
|
||||
_T("unknown--1" ),
|
||||
wxT("default" ),
|
||||
wxT("unknown--1" ),
|
||||
wxT("unknown--1" ),
|
||||
wxT("unknown--1" ),
|
||||
};
|
||||
|
||||
static const wxChar *descriptions[] =
|
||||
{
|
||||
// some valid charsets
|
||||
_T("Default encoding" ),
|
||||
_T("Western European (ISO-8859-1)" ),
|
||||
_T("Indian (ISO-8859-12)" ),
|
||||
_T("KOI8-R" ),
|
||||
_T("Unicode 7 bit (UTF-7)" ),
|
||||
_T("Windows Central European (CP 1250)"),
|
||||
_T("Windows Western European (CP 1252)"),
|
||||
wxT("Default encoding" ),
|
||||
wxT("Western European (ISO-8859-1)" ),
|
||||
wxT("Indian (ISO-8859-12)" ),
|
||||
wxT("KOI8-R" ),
|
||||
wxT("Unicode 7 bit (UTF-7)" ),
|
||||
wxT("Windows Central European (CP 1250)"),
|
||||
wxT("Windows Western European (CP 1252)"),
|
||||
|
||||
// and now some bogus ones
|
||||
_T("Default encoding" ),
|
||||
_T("Unknown encoding (-1)" ),
|
||||
_T("Unknown encoding (-1)" ),
|
||||
_T("Unknown encoding (-1)" ),
|
||||
wxT("Default encoding" ),
|
||||
wxT("Unknown encoding (-1)" ),
|
||||
wxT("Unknown encoding (-1)" ),
|
||||
wxT("Unknown encoding (-1)" ),
|
||||
};
|
||||
|
||||
wxFontMapperBase& fmap = *wxFontMapperBase::Get();
|
||||
|
Reference in New Issue
Block a user