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:
@@ -117,8 +117,8 @@ void TextFileTestCase::ReadDOS()
|
||||
CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
|
||||
}
|
||||
|
||||
void TextFileTestCase::ReadUnix()
|
||||
@@ -131,8 +131,8 @@ void TextFileTestCase::ReadUnix()
|
||||
CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
|
||||
}
|
||||
|
||||
void TextFileTestCase::ReadMac()
|
||||
@@ -145,8 +145,8 @@ void TextFileTestCase::ReadMac()
|
||||
CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
|
||||
}
|
||||
|
||||
void TextFileTestCase::ReadMixed()
|
||||
@@ -160,9 +160,9 @@ void TextFileTestCase::ReadMixed()
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(2) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("foo")), f.GetFirstLine() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("baz")), f.GetLastLine() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("foo")), f.GetFirstLine() );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("bar")), f.GetLine(1) );
|
||||
CPPUNIT_ASSERT_EQUAL( wxString(wxT("baz")), f.GetLastLine() );
|
||||
}
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
|
Reference in New Issue
Block a user