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:
@@ -68,33 +68,33 @@ void VarArgTestCase::StringPrintf()
|
||||
// test passing literals:
|
||||
s.Printf("%s %i", "foo", 42);
|
||||
CPPUNIT_ASSERT( s == "foo 42" );
|
||||
s.Printf("%s %s %i", _T("bar"), "=", 11);
|
||||
s.Printf("%s %s %i", wxT("bar"), "=", 11);
|
||||
|
||||
// test passing c_str():
|
||||
CPPUNIT_ASSERT( s == "bar = 11" );
|
||||
s2.Printf("(%s)", s.c_str());
|
||||
CPPUNIT_ASSERT( s2 == "(bar = 11)" );
|
||||
s2.Printf(_T("[%s](%s)"), s.c_str(), "str");
|
||||
s2.Printf(wxT("[%s](%s)"), s.c_str(), "str");
|
||||
CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
|
||||
|
||||
s2.Printf("%s mailbox", wxString("Opening").c_str());
|
||||
CPPUNIT_ASSERT( s2 == "Opening mailbox" );
|
||||
|
||||
// test passing wxString directly:
|
||||
s2.Printf(_T("[%s](%s)"), s, "str");
|
||||
s2.Printf(wxT("[%s](%s)"), s, "str");
|
||||
CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
|
||||
|
||||
// test passing wxCharBufferType<T>:
|
||||
s = "FooBar";
|
||||
s2.Printf(_T("(%s)"), s.mb_str());
|
||||
s2.Printf(wxT("(%s)"), s.mb_str());
|
||||
CPPUNIT_ASSERT( s2 == "(FooBar)" );
|
||||
s2.Printf(_T("value=%s;"), s.wc_str());
|
||||
s2.Printf(wxT("value=%s;"), s.wc_str());
|
||||
CPPUNIT_ASSERT( s2 == "value=FooBar;" );
|
||||
|
||||
// this tests correct passing of wxCStrData constructed from string
|
||||
// literal:
|
||||
bool cond = true;
|
||||
s2.Printf(_T("foo %s"), !cond ? s.c_str() : _T("bar"));
|
||||
s2.Printf(wxT("foo %s"), !cond ? s.c_str() : wxT("bar"));
|
||||
}
|
||||
|
||||
void VarArgTestCase::CharPrintf()
|
||||
|
Reference in New Issue
Block a user