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

Fix comparisons of char and wchar_t with wxUniChar[Ref].

Browse Source 
Comparisons didn't work correctly in the other direction as they were not
reversed as needed. Fix this by adding wxDEFINE_COMPARISON_REV() macro which
defines comparisons in terms of the reverse operations and use it for both
wxUniChar and wxUniCharRef.

Closes #14547.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-31 16:49:36 +00:00
parent d50905f761
commit 6d93e28adf
3 changed files with 70 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/strings/unichar.cpp
View File

@@ -68,48 +68,96 @@ void UniCharTestCase::CharCompare()
CPPUNIT_ASSERT( a == wxUniChar('a') );
CPPUNIT_ASSERT( a == wxUniChar(wxT('a')) );
CPPUNIT_ASSERT( a == a );
CPPUNIT_ASSERT( 'a' == a );
CPPUNIT_ASSERT( wxT('a') == a );
CPPUNIT_ASSERT( wxUniChar('a') == a );
CPPUNIT_ASSERT( wxUniChar(wxT('a')) == a );
CPPUNIT_ASSERT( a != b );
CPPUNIT_ASSERT( a != 'b' );
CPPUNIT_ASSERT( a != wxT('b') );
CPPUNIT_ASSERT( a != wxUniChar('b') );
CPPUNIT_ASSERT( a != wxUniChar(wxT('b')) );
CPPUNIT_ASSERT( b != a );
CPPUNIT_ASSERT( 'b' != a );
CPPUNIT_ASSERT( wxT('b') != a );
CPPUNIT_ASSERT( wxUniChar('b') != a );
CPPUNIT_ASSERT( wxUniChar(wxT('b')) != a );
CPPUNIT_ASSERT( a < b );
CPPUNIT_ASSERT( a < 'b' );
CPPUNIT_ASSERT( a < wxT('b') );
CPPUNIT_ASSERT( a < wxUniChar('b') );
CPPUNIT_ASSERT( a < wxUniChar(wxT('b')) );
CPPUNIT_ASSERT( b > a );
CPPUNIT_ASSERT( 'b' > a );
CPPUNIT_ASSERT( wxT('b') > a );
CPPUNIT_ASSERT( wxUniChar('b') > a );
CPPUNIT_ASSERT( wxUniChar(wxT('b')) > a );
CPPUNIT_ASSERT( a <= b );
CPPUNIT_ASSERT( a <= 'b' );
CPPUNIT_ASSERT( a <= wxT('b') );
CPPUNIT_ASSERT( a <= wxUniChar('b') );
CPPUNIT_ASSERT( a <= wxUniChar(wxT('b')) );
CPPUNIT_ASSERT( b >= a );
CPPUNIT_ASSERT( 'b' >= a );
CPPUNIT_ASSERT( wxT('b') >= a );
CPPUNIT_ASSERT( wxUniChar('b') >= a );
CPPUNIT_ASSERT( wxUniChar(wxT('b')) >= a );
CPPUNIT_ASSERT( a <= a );
CPPUNIT_ASSERT( a <= 'a' );
CPPUNIT_ASSERT( a <= wxT('a') );
CPPUNIT_ASSERT( a <= wxUniChar('a') );
CPPUNIT_ASSERT( a <= wxUniChar(wxT('a')) );
CPPUNIT_ASSERT( a >= a );
CPPUNIT_ASSERT( 'a' >= a );
CPPUNIT_ASSERT( wxT('a') >= a );
CPPUNIT_ASSERT( wxUniChar('a') >= a );
CPPUNIT_ASSERT( wxUniChar(wxT('a')) >= a );
CPPUNIT_ASSERT( b > a );
CPPUNIT_ASSERT( b > 'a' );
CPPUNIT_ASSERT( b > wxT('a') );
CPPUNIT_ASSERT( b > wxUniChar('a') );
CPPUNIT_ASSERT( b > wxUniChar(wxT('a')) );
CPPUNIT_ASSERT( a < b );
CPPUNIT_ASSERT( 'a' < b );
CPPUNIT_ASSERT( wxT('a') < b );
CPPUNIT_ASSERT( wxUniChar('a') < b );
CPPUNIT_ASSERT( wxUniChar(wxT('a')) < b );
CPPUNIT_ASSERT( b >= a );
CPPUNIT_ASSERT( b >= 'a' );
CPPUNIT_ASSERT( b >= wxT('a') );
CPPUNIT_ASSERT( b >= wxUniChar('a') );
CPPUNIT_ASSERT( b >= wxUniChar(wxT('a')) );
CPPUNIT_ASSERT( a <= b );
CPPUNIT_ASSERT( 'a' <= b );
CPPUNIT_ASSERT( wxT('a') <= b );
CPPUNIT_ASSERT( wxUniChar('a') <= b );
CPPUNIT_ASSERT( wxUniChar(wxT('a')) <= b );
CPPUNIT_ASSERT( b >= b );
CPPUNIT_ASSERT( b >= 'b' );
CPPUNIT_ASSERT( b >= wxT('b') );
CPPUNIT_ASSERT( b >= wxUniChar('b') );
CPPUNIT_ASSERT( b >= wxUniChar(wxT('b')) );
CPPUNIT_ASSERT( b <= b );
CPPUNIT_ASSERT( 'b' <= b );
CPPUNIT_ASSERT( wxT('b') <= b );
CPPUNIT_ASSERT( wxUniChar('b') <= b );
CPPUNIT_ASSERT( wxUniChar(wxT('b')) <= b );
CPPUNIT_ASSERT( b - a == 1 );
CPPUNIT_ASSERT( a - b == -1 );
}