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:
parent
32cdc45397
commit
9a83f86094
798 changed files with 10370 additions and 10349 deletions
|
|
@ -78,37 +78,37 @@ void ConvAutoTestCase::TestFirstChar(const char *src, wchar_t wch)
|
|||
|
||||
void ConvAutoTestCase::Empty()
|
||||
{
|
||||
TestFirstChar("", _T('\0'));
|
||||
TestFirstChar("", wxT('\0'));
|
||||
}
|
||||
|
||||
void ConvAutoTestCase::Short()
|
||||
{
|
||||
TestFirstChar("1", _T('1'));
|
||||
TestFirstChar("1", wxT('1'));
|
||||
}
|
||||
|
||||
void ConvAutoTestCase::None()
|
||||
{
|
||||
TestFirstChar("Hello world", _T('H'));
|
||||
TestFirstChar("Hello world", wxT('H'));
|
||||
}
|
||||
|
||||
void ConvAutoTestCase::UTF32LE()
|
||||
{
|
||||
TestFirstChar("\xff\xfe\0\0A\0\0\0", _T('A'));
|
||||
TestFirstChar("\xff\xfe\0\0A\0\0\0", wxT('A'));
|
||||
}
|
||||
|
||||
void ConvAutoTestCase::UTF32BE()
|
||||
{
|
||||
TestFirstChar("\0\0\xfe\xff\0\0\0B", _T('B'));
|
||||
TestFirstChar("\0\0\xfe\xff\0\0\0B", wxT('B'));
|
||||
}
|
||||
|
||||
void ConvAutoTestCase::UTF16LE()
|
||||
{
|
||||
TestFirstChar("\xff\xfeZ\0", _T('Z'));
|
||||
TestFirstChar("\xff\xfeZ\0", wxT('Z'));
|
||||
}
|
||||
|
||||
void ConvAutoTestCase::UTF16BE()
|
||||
{
|
||||
TestFirstChar("\xfe\xff\0Y", _T('Y'));
|
||||
TestFirstChar("\xfe\xff\0Y", wxT('Y'));
|
||||
}
|
||||
|
||||
void ConvAutoTestCase::UTF8()
|
||||
|
|
|
|||
|
|
@ -254,22 +254,22 @@ wxString CByteArrayFormat( const void* data, size_t len, const wxChar* name )
|
|||
const unsigned char* bytes = (unsigned char*)data;
|
||||
wxString result;
|
||||
|
||||
result.Printf( _T("static const unsigned char %s[%i] = \n{"), name, (int)len );
|
||||
result.Printf( wxT("static const unsigned char %s[%i] = \n{"), name, (int)len );
|
||||
|
||||
for ( size_t i = 0; i < len; i++ )
|
||||
{
|
||||
if ( i != 0 )
|
||||
{
|
||||
result.append( _T(",") );
|
||||
result.append( wxT(",") );
|
||||
}
|
||||
if ((i%16)==0)
|
||||
{
|
||||
result.append( _T("\n ") );
|
||||
result.append( wxT("\n ") );
|
||||
}
|
||||
wxString byte = wxString::Format( _T("0x%02x"), bytes[i] );
|
||||
wxString byte = wxString::Format( wxT("0x%02x"), bytes[i] );
|
||||
result.append(byte);
|
||||
}
|
||||
result.append( _T("\n};\n") );
|
||||
result.append( wxT("\n};\n") );
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -815,7 +815,7 @@ void MBConvTestCase::FontmapTests()
|
|||
|
||||
void MBConvTestCase::BufSize()
|
||||
{
|
||||
wxCSConv conv1251(_T("CP1251"));
|
||||
wxCSConv conv1251(wxT("CP1251"));
|
||||
CPPUNIT_ASSERT( conv1251.IsOk() );
|
||||
const char *cp1251text =
|
||||
"\313\301\326\305\324\323\321 \325\304\301\336\316\331\315";
|
||||
|
|
@ -842,7 +842,7 @@ void MBConvTestCase::BufSize()
|
|||
|
||||
|
||||
// test in the other direction too, using an encoding with multibyte NUL
|
||||
wxCSConv convUTF16(_T("UTF-16LE"));
|
||||
wxCSConv convUTF16(wxT("UTF-16LE"));
|
||||
CPPUNIT_ASSERT( convUTF16.IsOk() );
|
||||
const wchar_t *utf16text = L"Hello";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue