correct wrong #endif position which prevented ListCtrlTestCase::ItemRect() from being...

[wxWidgets.git] / tests / strings / strings.cpp

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 3542704e49cea77d7aca63941bbfc617fd94bae2..f9371210917e8028c965f613b311c1344846b358 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -531,7 +531,7 @@ enum
     Number_Unsigned = 2,    // if not specified, works for signed conversion
     Number_Signed   = 4,    // if not specified, works for unsigned
     Number_LongLong = 8,    // only for long long tests
     Number_Unsigned = 2,    // if not specified, works for signed conversion
     Number_Signed   = 4,    // if not specified, works for unsigned
     Number_LongLong = 8,    // only for long long tests

-    Number_Long     = 16,   // only for long tests
+    Number_Long     = 16    // only for long tests

 };
 
 static const struct ToLongData
 };
 
 static const struct ToLongData


@@ -834,13 +834,13 @@ void StringTestCase::ExplicitConversion()
 void StringTestCase::IndexedAccess()
 {
     wxString s("bar");
 void StringTestCase::IndexedAccess()
 {
     wxString s("bar");

-    CPPUNIT_ASSERT_EQUAL( 'r', s[2] );
+    CPPUNIT_ASSERT_EQUAL( 'r', (char)s[2] );

 
     // this tests for a possible bug in UTF-8 based wxString implementation:
     // the 3rd character of the underlying byte string is going to change, but
     // the 3rd character of wxString should remain the same
     s[0] = L'\u00e9';
 
     // this tests for a possible bug in UTF-8 based wxString implementation:
     // the 3rd character of the underlying byte string is going to change, but
     // the 3rd character of wxString should remain the same
     s[0] = L'\u00e9';

-    CPPUNIT_ASSERT_EQUAL( 'r', s[2] );
+    CPPUNIT_ASSERT_EQUAL( 'r', (char)s[2] );

 }
 
 void StringTestCase::BeforeAndAfter()
 }
 
 void StringTestCase::BeforeAndAfter()