first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*) 2. added template type-safe wrappers for vararg functions 3. added wxUniChar class representing single Unicode character 4. changed wxString::operator[] and wxString::iterator to return wxUniChar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -630,9 +630,10 @@ void StringTestCase::WriteBuf()
|
||||
wxString s;
|
||||
wxStrcpy(wxStringBuffer(s, 10), _T("foo"));
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL(_T('f'), s[0u]);
|
||||
CPPUNIT_ASSERT_EQUAL(_T('o'), s[1]);
|
||||
CPPUNIT_ASSERT_EQUAL(_T('o'), s[2]);
|
||||
CPPUNIT_ASSERT(s[0u] == _T('f') );
|
||||
CPPUNIT_ASSERT(_T('f') == s[0u]);
|
||||
CPPUNIT_ASSERT(_T('o') == s[1]);
|
||||
CPPUNIT_ASSERT(_T('o') == s[2]);
|
||||
CPPUNIT_ASSERT_EQUAL((size_t)3, s.length());
|
||||
|
||||
|
||||
@@ -642,10 +643,10 @@ void StringTestCase::WriteBuf()
|
||||
buf.SetLength(4);
|
||||
}
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL(_T('b'), s[0u]);
|
||||
CPPUNIT_ASSERT_EQUAL(_T('a'), s[1]);
|
||||
CPPUNIT_ASSERT_EQUAL(_T('r'), s[2]);
|
||||
CPPUNIT_ASSERT_EQUAL(_T('r'), s[3]);
|
||||
CPPUNIT_ASSERT(_T('b') == s[0u]);
|
||||
CPPUNIT_ASSERT(_T('a') == s[1]);
|
||||
CPPUNIT_ASSERT(_T('r') == s[2]);
|
||||
CPPUNIT_ASSERT(_T('r') == s[3]);
|
||||
CPPUNIT_ASSERT_EQUAL((size_t)4, s.length());
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) );
|
||||
|
Reference in New Issue
Block a user