wxDataViewCtrl patch from Hartwig

[wxWidgets.git] / tests / textfile / textfiletest.cpp

diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
index e451a87d8390f644cb1cedd1dce4b810c6a8532c..01b6da60af875e8287d4b6a7b2d6dbf342e3407c 100644 (file)
--- a/tests/textfile/textfiletest.cpp
+++ b/tests/textfile/textfiletest.cpp
@@ -97,7 +97,7 @@ void TextFileTestCase::ReadEmpty()
     wxTextFile f;
     CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
 
-    CPPUNIT_ASSERT_EQUAL( 0u, f.GetLineCount() );
+    CPPUNIT_ASSERT_EQUAL( (size_t)0, f.GetLineCount() );
 }
 
 void TextFileTestCase::ReadDOS()
@@ -107,7 +107,7 @@ void TextFileTestCase::ReadDOS()
     wxTextFile f;
     CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
 
-    CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+    CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
     CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
@@ -121,7 +121,7 @@ void TextFileTestCase::ReadUnix()
     wxTextFile f;
     CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
 
-    CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+    CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
     CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
@@ -135,7 +135,7 @@ void TextFileTestCase::ReadMac()
     wxTextFile f;
     CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
 
-    CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+    CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(2) );
     CPPUNIT_ASSERT_EQUAL( wxString(_T("bar")), f.GetLine(1) );
@@ -149,7 +149,7 @@ void TextFileTestCase::ReadMixed()
     wxTextFile f;
     CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName())) );
 
-    CPPUNIT_ASSERT_EQUAL( 3u, f.GetLineCount() );
+    CPPUNIT_ASSERT_EQUAL( (size_t)3, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Mac, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(1) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(2) );
@@ -168,12 +168,14 @@ void TextFileTestCase::ReadUTF8()
     wxTextFile f;
     CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName()), wxConvUTF8) );
 
-    CPPUNIT_ASSERT_EQUAL( 2u, f.GetLineCount() );
+    CPPUNIT_ASSERT_EQUAL( (size_t)2, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Unix, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(1) );
+#ifdef wxHAVE_U_ESCAPE
     CPPUNIT_ASSERT_EQUAL( wxString(L"\u041f"), f.GetFirstLine() );
     CPPUNIT_ASSERT_EQUAL( wxString(L"\u0440\u0438\u0432\u0435\u0442"),
                           f.GetLastLine() );
+#endif // wxHAVE_U_ESCAPE
 }
 
 void TextFileTestCase::ReadUTF16()
@@ -183,15 +185,18 @@ void TextFileTestCase::ReadUTF16()
                    "\x40\x04\x38\x04\x32\x04\x35\x04\x42\x04");
 
     wxTextFile f;
-    wxMBConvUTF16 conv;
+    wxMBConvUTF16LE conv;
     CPPUNIT_ASSERT( f.Open(wxString::FromAscii(GetTestFileName()), conv) );
 
-    CPPUNIT_ASSERT_EQUAL( 2u, f.GetLineCount() );
+    CPPUNIT_ASSERT_EQUAL( (size_t)2, f.GetLineCount() );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_Dos, f.GetLineType(0) );
     CPPUNIT_ASSERT_EQUAL( wxTextFileType_None, f.GetLineType(1) );
+
+#ifdef wxHAVE_U_ESCAPE
     CPPUNIT_ASSERT_EQUAL( wxString(L"\u041f"), f.GetFirstLine() );
     CPPUNIT_ASSERT_EQUAL( wxString(L"\u0440\u0438\u0432\u0435\u0442"),
                           f.GetLastLine() );
+#endif // wxHAVE_U_ESCAPE
 }
 
 #endif // wxUSE_UNICODE