Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.5.3 - cleanups, fixes, etc. etc. -

Browse Source 
1. Various stubs for wxCocoa (and the bakefile entries for them)
2. Definitions for some wxCocoa cocoa types in defs.h
3. Hack to attempt to fix SYNC sound for mac carbon
4. Fix for wxCocoa and 10.2 (Dave - I'm already around doing some stuff anyway - I'll go ahead and save you the trouble).
5. 10.2 unicode layer
6. Strings null-char fixes (stems from chartraits patch - essentially the patch minus the chartraits part - HAHA :)) [note to self - swap the 2nd and 3rd params of wxMemchr if you use chartraits and vice versa]
	* If you have time please run the strings and stdstrings cppunit test suite
	* Also add more test suites if you want - more is always better :)
	* This does not include any fixes for mbtowc etc functions as outlined on the ml

7. An attempt to update wxArray docs a little
8. wx/process.h build fix for wxCocoa
9. Unicode fixes in app.mm for wxCocoa
10. Remove newer font panel after Stefan's suggestion


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-10-07 08:53:48 +00:00
parent 685cdfcb9e
commit dcb6810279
31 changed files with 792 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
tests/strings/stdstrings.cpp
View File

@@ -208,6 +208,33 @@ void StdStringTestCase::StdFind()
CPPUNIT_ASSERT( s1.find(s2) == 6u );
CPPUNIT_ASSERT( s1.find(s2, 7) == wxString::npos );
CPPUNIT_ASSERT( s1.find(s2, 6) == 6u );
// 0 1 2
// 0123456 78901234567 8901234567
//wxString _s1 = _T("abcdefg\0ABCDEFGabc\0ABCabcABC");
//wxString _s2 = _T("g\0AB");
wxString _s1 = _T("abcdefgABCDEFGabcABCabcABC");
wxString _s2 = _T("gAB");
_s1.insert(7, 1, '\0');
_s1.insert(18, 1, '\0');
_s2.insert(1, 1, '\0');
CPPUNIT_ASSERT( _s1.find(_T('A')) == 8u );
CPPUNIT_ASSERT( _s1.find(_T('A'), 8) == 8u );
CPPUNIT_ASSERT( _s1.find(_T('Z')) == wxString::npos );
CPPUNIT_ASSERT( _s1.find(_T('C'), 22) == 27u );
CPPUNIT_ASSERT( _s1.find(_T("AB")) == 8u );
CPPUNIT_ASSERT( _s1.find(_T("AB"), 26) == wxString::npos );
CPPUNIT_ASSERT( _s1.find(_T("AB"), 23) == 25u );
CPPUNIT_ASSERT( _s1.find(_T("ABZZZ"), 2, 2) == 8u );
CPPUNIT_ASSERT( _s1.find(_T("ABZZZ"), 26, 2) == wxString::npos );
CPPUNIT_ASSERT( _s1.find(_s2) == 6u );
CPPUNIT_ASSERT( _s1.find(_s2, 7) == wxString::npos );
CPPUNIT_ASSERT( _s1.find(_s2, 6) == 6u );
}
void StdStringTestCase::StdFindFirst()
@@ -343,6 +370,28 @@ void StdStringTestCase::StdRFind()
CPPUNIT_ASSERT( s1.rfind(s2, 5) == wxString::npos );
CPPUNIT_ASSERT( s1.rfind(s2, 6) == 6u );
CPPUNIT_ASSERT( s1.rfind(s3, 1) == 0u );
// 0 1 2
// 01234 56789012 345678901234567
// wxString s1 = _T("abcde\0fgABCDE\0FGabcABCabcABC");
// wxString s2 = _T("gAB");
// wxString s3 = _T("ab");
s1.insert(5,1,'\0');
s1.insert(13,1,'\0');
CPPUNIT_ASSERT( s1.rfind(_T('A')) == 25u );
CPPUNIT_ASSERT( s1.rfind(_T('A'), 8) == 8u );
CPPUNIT_ASSERT( s1.rfind(_T('Z')) == wxString::npos );
CPPUNIT_ASSERT( s1.rfind(_T('C'), 22) == 21u );
CPPUNIT_ASSERT( s1.rfind(_T("cAB")) == 24u );
CPPUNIT_ASSERT( s1.rfind(_T("cAB"), 15) == wxString::npos );
CPPUNIT_ASSERT( s1.rfind(_T("cAB"), 21) == 18u );
CPPUNIT_ASSERT( s1.rfind(_T("gABZZZ"), 8, 3) == 7u );
CPPUNIT_ASSERT( s1.rfind(_T("gABZZZ"), 5, 3) == wxString::npos );
}
void StdStringTestCase::StdResize()
@@ -370,5 +419,24 @@ void StdStringTestCase::StdSubstr()
CPPUNIT_ASSERT( s1.substr( 1, 13 ) == _T("bcdefgABCDEFG") );
CPPUNIT_ASSERT( s1.substr( 1, 20 ) == _T("bcdefgABCDEFG") );
CPPUNIT_ASSERT( s1.substr( 14, 30 ) == _T("") );
// 1
// 012 34567 89012 3456
// wxString s1 = _T("abc\0defg\0ABCD\0EFG");
s1.insert(3,1,'\0');
s1.insert(8,1,'\0');
s1.insert(13,1,'\0');
wxString s2 = wxT("bcdefgABCDEFG");
s2.insert(2,1,'\0');
s2.insert(7,1,'\0');
s2.insert(12,1,'\0');
CPPUNIT_ASSERT( s1.substr( 0, 17 ) == s1 );
CPPUNIT_ASSERT( s1.substr( 1, 17 ) == s2 );
CPPUNIT_ASSERT( s1.substr( 1, 20 ) == s2 );
CPPUNIT_ASSERT( s1.substr( 17, 30 ) == _T("") );
}