X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9f7896861f734ce044ee8601ba2d8a6959c9d9e..ae8079a2109cc4cfe27fe5de16679726dd7660ca:/tests/strings/unichar.cpp

diff --git a/tests/strings/unichar.cpp b/tests/strings/unichar.cpp
index 9c6613b299..4bd9dfd844 100644
--- a/tests/strings/unichar.cpp
+++ b/tests/strings/unichar.cpp
@@ -38,7 +38,9 @@ private:
         CPPUNIT_TEST( CharCompare );
         CPPUNIT_TEST( CharCompareIntl );
         CPPUNIT_TEST( StringCompare );
+#if wxUSE_UNICODE
         CPPUNIT_TEST( StringCompareIntl );
+#endif // wxUSE_UNICODE
     CPPUNIT_TEST_SUITE_END();
 
     void CharCompare();
@@ -52,7 +54,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( UniCharTestCase );
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( UniCharTestCase, "UniCharTestCase" );
 
 void UniCharTestCase::CharCompare()
@@ -62,51 +64,51 @@ void UniCharTestCase::CharCompare()
 
     CPPUNIT_ASSERT( a == a );
     CPPUNIT_ASSERT( a == 'a' );
-    CPPUNIT_ASSERT( a == _T('a') );
+    CPPUNIT_ASSERT( a == wxT('a') );
     CPPUNIT_ASSERT( a == wxUniChar('a') );
-    CPPUNIT_ASSERT( a == wxUniChar(_T('a')) );
+    CPPUNIT_ASSERT( a == wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( a != b );
     CPPUNIT_ASSERT( a != 'b' );
-    CPPUNIT_ASSERT( a != _T('b') );
+    CPPUNIT_ASSERT( a != wxT('b') );
     CPPUNIT_ASSERT( a != wxUniChar('b') );
-    CPPUNIT_ASSERT( a != wxUniChar(_T('b')) );
+    CPPUNIT_ASSERT( a != wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( a < b );
     CPPUNIT_ASSERT( a < 'b' );
-    CPPUNIT_ASSERT( a < _T('b') );
+    CPPUNIT_ASSERT( a < wxT('b') );
     CPPUNIT_ASSERT( a < wxUniChar('b') );
-    CPPUNIT_ASSERT( a < wxUniChar(_T('b')) );
+    CPPUNIT_ASSERT( a < wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( a <= b );
     CPPUNIT_ASSERT( a <= 'b' );
-    CPPUNIT_ASSERT( a <= _T('b') );
+    CPPUNIT_ASSERT( a <= wxT('b') );
     CPPUNIT_ASSERT( a <= wxUniChar('b') );
-    CPPUNIT_ASSERT( a <= wxUniChar(_T('b')) );
+    CPPUNIT_ASSERT( a <= wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( a <= a );
     CPPUNIT_ASSERT( a <= 'a' );
-    CPPUNIT_ASSERT( a <= _T('a') );
+    CPPUNIT_ASSERT( a <= wxT('a') );
     CPPUNIT_ASSERT( a <= wxUniChar('a') );
-    CPPUNIT_ASSERT( a <= wxUniChar(_T('a')) );
+    CPPUNIT_ASSERT( a <= wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( b > a );
     CPPUNIT_ASSERT( b > 'a' );
-    CPPUNIT_ASSERT( b > _T('a') );
+    CPPUNIT_ASSERT( b > wxT('a') );
     CPPUNIT_ASSERT( b > wxUniChar('a') );
-    CPPUNIT_ASSERT( b > wxUniChar(_T('a')) );
+    CPPUNIT_ASSERT( b > wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( b >= a );
     CPPUNIT_ASSERT( b >= 'a' );
-    CPPUNIT_ASSERT( b >= _T('a') );
+    CPPUNIT_ASSERT( b >= wxT('a') );
     CPPUNIT_ASSERT( b >= wxUniChar('a') );
-    CPPUNIT_ASSERT( b >= wxUniChar(_T('a')) );
+    CPPUNIT_ASSERT( b >= wxUniChar(wxT('a')) );
 
     CPPUNIT_ASSERT( b >= b );
     CPPUNIT_ASSERT( b >= 'b' );
-    CPPUNIT_ASSERT( b >= _T('b') );
+    CPPUNIT_ASSERT( b >= wxT('b') );
     CPPUNIT_ASSERT( b >= wxUniChar('b') );
-    CPPUNIT_ASSERT( b >= wxUniChar(_T('b')) );
+    CPPUNIT_ASSERT( b >= wxUniChar(wxT('b')) );
 
     CPPUNIT_ASSERT( b - a == 1 );
     CPPUNIT_ASSERT( a - b == -1 );
@@ -163,7 +165,7 @@ void UniCharTestCase::StringCompare()
     wxString sa = "a";
     const wxString sb = "b";
     char c1 = 'a';
-    wchar_t c2 = _T('a');
+    wchar_t c2 = wxT('a');
     wxUniChar c3 = 'a';
 
     CPPUNIT_ASSERT( sa == 'a');
@@ -199,6 +201,7 @@ void UniCharTestCase::StringCompare()
     CPPUNIT_ASSERT( sb[0] != sa);
 }
 
+#if wxUSE_UNICODE
 void UniCharTestCase::StringCompareIntl()
 {
     // test string comparison with chars
@@ -234,3 +237,4 @@ void UniCharTestCase::StringCompareIntl()
     CPPUNIT_ASSERT( sa != sb[0]);
     CPPUNIT_ASSERT( sb[0] != sa);
 }
+#endif // wxUSE_UNICODE