Minor corrections to make dist after reports

[wxWidgets.git] / tests / mbconv / mbconvtest.cpp

diff --git a/tests/mbconv/mbconvtest.cpp b/tests/mbconv/mbconvtest.cpp
index 599452415c514ecedac85d4cfdf48bc3556dc421..b5d0185467718f2d240988262948671c34f68109 100644 (file)
--- a/tests/mbconv/mbconvtest.cpp
+++ b/tests/mbconv/mbconvtest.cpp
@@ -78,6 +78,7 @@ private:
         CPPUNIT_TEST( CP1252Tests ); // depends on UTF8 Decoder functioning correctly
         CPPUNIT_TEST( LibcTests );
         CPPUNIT_TEST( IconvTests );
         CPPUNIT_TEST( CP1252Tests ); // depends on UTF8 Decoder functioning correctly
         CPPUNIT_TEST( LibcTests );
         CPPUNIT_TEST( IconvTests );

+        CPPUNIT_TEST( Latin1Tests );

         CPPUNIT_TEST( FontmapTests );
 #ifdef HAVE_WCHAR_H
         CPPUNIT_TEST( UTF8_41 );
         CPPUNIT_TEST( FontmapTests );
 #ifdef HAVE_WCHAR_H
         CPPUNIT_TEST( UTF8_41 );


@@ -113,6 +114,7 @@ private:
     void LibcTests();
     void FontmapTests();
     void IconvTests();
     void LibcTests();
     void FontmapTests();
     void IconvTests();

+    void Latin1Tests();

 
     // verifies that the specified multibyte sequence decodes to the specified wchar_t sequence
     void TestDecoder(
 
     // verifies that the specified multibyte sequence decodes to the specified wchar_t sequence
     void TestDecoder(


@@ -120,7 +122,7 @@ private:
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-        wxMBConv*      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence
+        wxMBConv&      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence

         int            sizeofNull   // number of bytes occupied by terminating null in this encoding
         );
 
         int            sizeofNull   // number of bytes occupied by terminating null in this encoding
         );
 


@@ -130,7 +132,7 @@ private:
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-        wxMBConv*      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence
+        wxMBConv&      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence

         int            sizeofNull   // number of bytes occupied by terminating null in this encoding
         );
 
         int            sizeofNull   // number of bytes occupied by terminating null in this encoding
         );
 


@@ -142,7 +144,7 @@ private:
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-        wxMBConv*      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence
+        wxMBConv&      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence

         );
 
     // use wxTextOutputStream to exercise wxMBConv interface
         );
 
     // use wxTextOutputStream to exercise wxMBConv interface


@@ -152,7 +154,7 @@ private:
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
         size_t         wideChars,   // the number of wide characters at wideBuffer
         const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-        wxMBConv*      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence
+        wxMBConv&      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence

         );
 #endif
 
         );
 #endif
 


@@ -167,7 +169,7 @@ private:
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
         const char*    utf8Buffer,  // the same character sequence as multiBuffer, encoded as UTF-8
         size_t         utf8Bytes,   // the byte length of the UTF-8 encoded character sequence
         size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
         const char*    utf8Buffer,  // the same character sequence as multiBuffer, encoded as UTF-8
         size_t         utf8Bytes,   // the byte length of the UTF-8 encoded character sequence

-        wxMBConv*      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence
+        wxMBConv&      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence

         int            sizeofNull   // the number of bytes occupied by a terminating null in the converter's encoding
         );
 
         int            sizeofNull   // the number of bytes occupied by a terminating null in the converter's encoding
         );
 


@@ -213,6 +215,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( MBConvTestCase );
 
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MBConvTestCase, "MBConvTestCase" );
 
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MBConvTestCase, "MBConvTestCase" );

+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MBConvTestCase, "MBConv" );

 
 void MBConvTestCase::WC2CP1250()
 {
 
 void MBConvTestCase::WC2CP1250()
 {


@@ -241,7 +244,9 @@ void MBConvTestCase::WC2CP1250()
     }
 }
 
     }
 }
 

-// print an unsigned character array as a C unsigned character array
+// Print an unsigned character array as a C unsigned character array.
+// NB: Please don't remove this function even though it's not used anywhere,
+//     it's very useful when debugging a failed test.

 wxString CByteArrayFormat( const void* data, size_t len, const wxChar* name )
 {
     const unsigned char* bytes = (unsigned char*)data;
 wxString CByteArrayFormat( const void* data, size_t len, const wxChar* name )
 {
     const unsigned char* bytes = (unsigned char*)data;


@@ -266,11 +271,11 @@ wxString CByteArrayFormat( const void* data, size_t len, const wxChar* name )
     return result;
 }
 
     return result;
 }
 

-// The following bytes represent the same string, containing Japanese and English 
+// The following bytes represent the same string, containing Japanese and English

 // characters, encoded in several different formats.
 
 // encoded by iconv
 // characters, encoded in several different formats.
 
 // encoded by iconv

-const static unsigned char welcome_utf7_iconv[84] = 
+const static unsigned char welcome_utf7_iconv[84] =

 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x6f,0x75,0x72,0x20,0x63,
     0x79,0x62,0x65,0x72,0x20,0x73,0x70,0x61,0x63,0x65,0x20,0x66,0x6f,0x72,0x63,0x65,
 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x6f,0x75,0x72,0x20,0x63,
     0x79,0x62,0x65,0x72,0x20,0x73,0x70,0x61,0x63,0x65,0x20,0x66,0x6f,0x72,0x63,0x65,


@@ -280,7 +285,7 @@ const static unsigned char welcome_utf7_iconv[84] =
     0x57,0x54,0x41,0x43
 };
 // encoded by wxWindows (iconv can decode this successfully)
     0x57,0x54,0x41,0x43
 };
 // encoded by wxWindows (iconv can decode this successfully)

-const static unsigned char welcome_utf7_wx[109] = 
+const static unsigned char welcome_utf7_wx[109] =

 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x2b,0x41,0x43,0x41,0x2d,0x74,0x6f,0x2b,0x41,
     0x43,0x41,0x2d,0x6f,0x75,0x72,0x2b,0x41,0x43,0x41,0x2d,0x63,0x79,0x62,0x65,0x72,
 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x2b,0x41,0x43,0x41,0x2d,0x74,0x6f,0x2b,0x41,
     0x43,0x41,0x2d,0x6f,0x75,0x72,0x2b,0x41,0x43,0x41,0x2d,0x63,0x79,0x62,0x65,0x72,


@@ -291,7 +296,7 @@ const static unsigned char welcome_utf7_wx[109] =
     0x51,0x77,0x52,0x44,0x42,0x6e,0x4d,0x46,0x6b,0x77,0x41,0x67,0x2d
 };
 // encoded by iconv
     0x51,0x77,0x52,0x44,0x42,0x6e,0x4d,0x46,0x6b,0x77,0x41,0x67,0x2d
 };
 // encoded by iconv

-const static unsigned char welcome_utf8[89] = 
+const static unsigned char welcome_utf8[89] =

 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x6f,0x75,0x72,0x20,0x63,
     0x79,0x62,0x65,0x72,0x20,0x73,0x70,0x61,0x63,0x65,0x20,0x66,0x6f,0x72,0x63,0x65,
 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x6f,0x75,0x72,0x20,0x63,
     0x79,0x62,0x65,0x72,0x20,0x73,0x70,0x61,0x63,0x65,0x20,0x66,0x6f,0x72,0x63,0x65,


@@ -301,7 +306,7 @@ const static unsigned char welcome_utf8[89] =
     0xe3,0x81,0xa7,0xe3,0x81,0x99,0xe3,0x80,0x82
 };
 // encoded by iconv
     0xe3,0x81,0xa7,0xe3,0x81,0x99,0xe3,0x80,0x82
 };
 // encoded by iconv

-const static unsigned char welcome_utf16le[106] = 
+const static unsigned char welcome_utf16le[106] =

 {
     0x57,0x00,0x65,0x00,0x6c,0x00,0x63,0x00,0x6f,0x00,0x6d,0x00,0x65,0x00,0x20,0x00,
     0x74,0x00,0x6f,0x00,0x20,0x00,0x6f,0x00,0x75,0x00,0x72,0x00,0x20,0x00,0x63,0x00,
 {
     0x57,0x00,0x65,0x00,0x6c,0x00,0x63,0x00,0x6f,0x00,0x6d,0x00,0x65,0x00,0x20,0x00,
     0x74,0x00,0x6f,0x00,0x20,0x00,0x6f,0x00,0x75,0x00,0x72,0x00,0x20,0x00,0x63,0x00,


@@ -312,7 +317,7 @@ const static unsigned char welcome_utf16le[106] =
     0x44,0x30,0x44,0x30,0x67,0x30,0x59,0x30,0x02,0x30
 };
 // encoded by iconv
     0x44,0x30,0x44,0x30,0x67,0x30,0x59,0x30,0x02,0x30
 };
 // encoded by iconv

-const static unsigned char welcome_utf16be[106] = 
+const static unsigned char welcome_utf16be[106] =

 {
     0x00,0x57,0x00,0x65,0x00,0x6c,0x00,0x63,0x00,0x6f,0x00,0x6d,0x00,0x65,0x00,0x20,
     0x00,0x74,0x00,0x6f,0x00,0x20,0x00,0x6f,0x00,0x75,0x00,0x72,0x00,0x20,0x00,0x63,
 {
     0x00,0x57,0x00,0x65,0x00,0x6c,0x00,0x63,0x00,0x6f,0x00,0x6d,0x00,0x65,0x00,0x20,
     0x00,0x74,0x00,0x6f,0x00,0x20,0x00,0x6f,0x00,0x75,0x00,0x72,0x00,0x20,0x00,0x63,


@@ -323,7 +328,7 @@ const static unsigned char welcome_utf16be[106] =
     0x30,0x44,0x30,0x44,0x30,0x67,0x30,0x59,0x30,0x02
 };
 // encoded by iconv
     0x30,0x44,0x30,0x44,0x30,0x67,0x30,0x59,0x30,0x02
 };
 // encoded by iconv

-const static unsigned char welcome_utf32le[212] = 
+const static unsigned char welcome_utf32le[212] =

 {
     0x57,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x6c,0x00,0x00,0x00,0x63,0x00,0x00,0x00,
     0x6f,0x00,0x00,0x00,0x6d,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
 {
     0x57,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x6c,0x00,0x00,0x00,0x63,0x00,0x00,0x00,
     0x6f,0x00,0x00,0x00,0x6d,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x20,0x00,0x00,0x00,


@@ -341,7 +346,7 @@ const static unsigned char welcome_utf32le[212] =
     0x02,0x30,0x00,0x00
 };
 // encoded by iconv
     0x02,0x30,0x00,0x00
 };
 // encoded by iconv

-const static unsigned char welcome_utf32be[212] = 
+const static unsigned char welcome_utf32be[212] =

 {
     0x00,0x00,0x00,0x57,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x6c,0x00,0x00,0x00,0x63,
     0x00,0x00,0x00,0x6f,0x00,0x00,0x00,0x6d,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x20,
 {
     0x00,0x00,0x00,0x57,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x6c,0x00,0x00,0x00,0x63,
     0x00,0x00,0x00,0x6f,0x00,0x00,0x00,0x6d,0x00,0x00,0x00,0x65,0x00,0x00,0x00,0x20,


@@ -359,7 +364,7 @@ const static unsigned char welcome_utf32be[212] =
     0x00,0x00,0x30,0x02
 };
 // encoded by iconv
     0x00,0x00,0x30,0x02
 };
 // encoded by iconv

-const static unsigned char welcome_cp932[71] = 
+const static unsigned char welcome_cp932[71] =

 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x6f,0x75,0x72,0x20,0x63,
     0x79,0x62,0x65,0x72,0x20,0x73,0x70,0x61,0x63,0x65,0x20,0x66,0x6f,0x72,0x63,0x65,
 {
     0x57,0x65,0x6c,0x63,0x6f,0x6d,0x65,0x20,0x74,0x6f,0x20,0x6f,0x75,0x72,0x20,0x63,
     0x79,0x62,0x65,0x72,0x20,0x73,0x70,0x61,0x63,0x65,0x20,0x66,0x6f,0x72,0x63,0x65,


@@ -384,45 +389,51 @@ const static unsigned char welcome_cp932[71] =
 
 void MBConvTestCase::UTF7Tests()
 {
 
 void MBConvTestCase::UTF7Tests()
 {

+#if 0
+    wxCSConv convUTF7(wxFONTENCODING_UTF7);
+#else
+    wxMBConvUTF7 convUTF7;
+#endif
+

     TestDecoder
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf7_iconv, 
-        sizeof(welcome_utf7_iconv), 
-        &wxConvUTF7,
+        (const char*)welcome_utf7_iconv,
+        sizeof(welcome_utf7_iconv),
+        convUTF7,

         1
         );
     TestDecoder
         1
         );
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf7_wx, 
-        sizeof(welcome_utf7_wx), 
-        &wxConvUTF7,
+        (const char*)welcome_utf7_wx,
+        sizeof(welcome_utf7_wx),
+        convUTF7,

         1
         );
         1
         );

-#if 0 
-    // wxWidget's UTF-7 encoder generates different byte sequences than iconv's.  
+#if 0
+    // wxWidget's UTF-7 encoder generates different byte sequences than iconv's.

     // but both seem to be equally legal.
     // This test won't work and that's okay.
     TestEncoder
     // but both seem to be equally legal.
     // This test won't work and that's okay.
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf7_iconv, 
-        sizeof(welcome_utf7_iconv), 
-        &wxConvUTF7,
+        (const char*)welcome_utf7_iconv,
+        sizeof(welcome_utf7_iconv),
+        convUTF7,

         1
         );
 #endif
     TestEncoder
         1
         );
 #endif
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf7_wx, 
-        sizeof(welcome_utf7_wx), 
-        &wxConvUTF7,
+        (const char*)welcome_utf7_wx,
+        sizeof(welcome_utf7_wx),
+        convUTF7,

         1
         );
 }
         1
         );
 }


@@ -430,21 +441,21 @@ void MBConvTestCase::UTF7Tests()
 void MBConvTestCase::UTF8Tests()
 {
     TestDecoder
 void MBConvTestCase::UTF8Tests()
 {
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf8, 
-        sizeof(welcome_utf8), 
-        &wxConvUTF8,
+        (const char*)welcome_utf8,
+        sizeof(welcome_utf8),
+        wxConvUTF8,

         1
         );
     TestEncoder
         1
         );
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf8, 
-        sizeof(welcome_utf8), 
-        &wxConvUTF8,
+        (const char*)welcome_utf8,
+        sizeof(welcome_utf8),
+        wxConvUTF8,

         1
         );
 }
         1
         );
 }


@@ -453,21 +464,21 @@ void MBConvTestCase::UTF16LETests()
 {
     wxMBConvUTF16LE convUTF16LE;
     TestDecoder
 {
     wxMBConvUTF16LE convUTF16LE;
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf16le, 
-        sizeof(welcome_utf16le), 
-        &convUTF16LE,
+        (const char*)welcome_utf16le,
+        sizeof(welcome_utf16le),
+        convUTF16LE,

         2
         );
     TestEncoder
         2
         );
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf16le, 
-        sizeof(welcome_utf16le), 
-        &convUTF16LE,
+        (const char*)welcome_utf16le,
+        sizeof(welcome_utf16le),
+        convUTF16LE,

         2
         );
 }
         2
         );
 }


@@ -476,21 +487,21 @@ void MBConvTestCase::UTF16BETests()
 {
     wxMBConvUTF16BE convUTF16BE;
     TestDecoder
 {
     wxMBConvUTF16BE convUTF16BE;
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf16be, 
-        sizeof(welcome_utf16be), 
-        &convUTF16BE,
+        (const char*)welcome_utf16be,
+        sizeof(welcome_utf16be),
+        convUTF16BE,

         2
         );
     TestEncoder
         2
         );
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf16be, 
-        sizeof(welcome_utf16be), 
-        &convUTF16BE,
+        (const char*)welcome_utf16be,
+        sizeof(welcome_utf16be),
+        convUTF16BE,

         2
         );
 }
         2
         );
 }


@@ -499,21 +510,21 @@ void MBConvTestCase::UTF32LETests()
 {
     wxMBConvUTF32LE convUTF32LE;
     TestDecoder
 {
     wxMBConvUTF32LE convUTF32LE;
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf32le, 
-        sizeof(welcome_utf32le), 
-        &convUTF32LE,
+        (const char*)welcome_utf32le,
+        sizeof(welcome_utf32le),
+        convUTF32LE,

         4
         );
     TestEncoder
         4
         );
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf32le, 
-        sizeof(welcome_utf32le), 
-        &convUTF32LE,
+        (const char*)welcome_utf32le,
+        sizeof(welcome_utf32le),
+        convUTF32LE,

         4
         );
 }
         4
         );
 }


@@ -522,21 +533,21 @@ void MBConvTestCase::UTF32BETests()
 {
     wxMBConvUTF32BE convUTF32BE;
     TestDecoder
 {
     wxMBConvUTF32BE convUTF32BE;
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf32be, 
-        sizeof(welcome_utf32be), 
-        &convUTF32BE,
+        (const char*)welcome_utf32be,
+        sizeof(welcome_utf32be),
+        convUTF32BE,

         4
         );
     TestEncoder
         4
         );
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_utf32be, 
-        sizeof(welcome_utf32be), 
-        &convUTF32BE,
+        (const char*)welcome_utf32be,
+        sizeof(welcome_utf32be),
+        convUTF32BE,

         4
         );
 }
         4
         );
 }


@@ -545,27 +556,27 @@ void MBConvTestCase::CP932Tests()
 {
     wxCSConv convCP932( wxFONTENCODING_CP932 );
     TestDecoder
 {
     wxCSConv convCP932( wxFONTENCODING_CP932 );
     TestDecoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_cp932, 
-        sizeof(welcome_cp932), 
-        &convCP932,
+        (const char*)welcome_cp932,
+        sizeof(welcome_cp932),
+        convCP932,

         1
         );
     TestEncoder
         1
         );
     TestEncoder

-        ( 
-        (const wchar_t*)welcome_wchar_t, 
+        (
+        (const wchar_t*)welcome_wchar_t,

         sizeof(welcome_wchar_t)/sizeof(wchar_t),
         sizeof(welcome_wchar_t)/sizeof(wchar_t),

-        (const char*)welcome_cp932, 
-        sizeof(welcome_cp932), 
-        &convCP932,
+        (const char*)welcome_cp932,
+        sizeof(welcome_cp932),
+        convCP932,

         1
         );
 }
 
 // a character sequence encoded as iso8859-1 (iconv)
         1
         );
 }
 
 // a character sequence encoded as iso8859-1 (iconv)

-static const unsigned char iso8859_1[251] = 
+static const unsigned char iso8859_1[251] =

 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,
 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,


@@ -585,7 +596,7 @@ static const unsigned char iso8859_1[251] =
     0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff
 };
 // the above character sequence encoded as UTF-8 (iconv)
     0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff
 };
 // the above character sequence encoded as UTF-8 (iconv)

-static const unsigned char iso8859_1_utf8[379] = 
+static const unsigned char iso8859_1_utf8[379] =

 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,
 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,


@@ -614,7 +625,7 @@ static const unsigned char iso8859_1_utf8[379] =
 };
 
 // a character sequence encoded as CP1252 (iconv)
 };
 
 // a character sequence encoded as CP1252 (iconv)

-static const unsigned char CP1252[246] = 
+static const unsigned char CP1252[246] =

 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,
 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,


@@ -634,7 +645,7 @@ static const unsigned char CP1252[246] =
     0x85,0x89,0x8b,0x9b,0x80,0x99
 };
 // the above character sequence encoded as UTF-8 (iconv)
     0x85,0x89,0x8b,0x9b,0x80,0x99
 };
 // the above character sequence encoded as UTF-8 (iconv)

-static const unsigned char CP1252_utf8[386] = 
+static const unsigned char CP1252_utf8[386] =

 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,
 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,


@@ -664,7 +675,7 @@ static const unsigned char CP1252_utf8[386] =
 };
 
 // a character sequence encoded as iso8859-5 (iconv)
 };
 
 // a character sequence encoded as iso8859-5 (iconv)

-static const unsigned char iso8859_5[251] = 
+static const unsigned char iso8859_5[251] =

 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,
 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,


@@ -684,7 +695,7 @@ static const unsigned char iso8859_5[251] =
     0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfe,0xff,0xf0
 };
 // the above character sequence encoded as UTF-8 (iconv)
     0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfe,0xff,0xf0
 };
 // the above character sequence encoded as UTF-8 (iconv)

-static const unsigned char iso8859_5_utf8[380] = 
+static const unsigned char iso8859_5_utf8[380] =

 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,
 {
     0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,
     0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,


@@ -740,7 +751,7 @@ void MBConvTestCase::TestCoder(
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
     const char*    utf8Buffer,  // the same character sequence as multiBuffer, encoded as UTF-8
     size_t         utf8Bytes,   // the byte length of the UTF-8 encoded character sequence
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
     const char*    utf8Buffer,  // the same character sequence as multiBuffer, encoded as UTF-8
     size_t         utf8Bytes,   // the byte length of the UTF-8 encoded character sequence

-    wxMBConv*      converter,   // the wxMBConv object thta can decode multiBuffer into a wide character sequence
+    wxMBConv&      converter,   // the wxMBConv object thta can decode multiBuffer into a wide character sequence

     int            sizeofNull   // the number of bytes occupied by a terminating null in the converter's encoding
     )
 {
     int            sizeofNull   // the number of bytes occupied by a terminating null in the converter's encoding
     )
 {


@@ -754,19 +765,19 @@ void MBConvTestCase::TestCoder(
     size_t wideChars = wxWcslen( wideBuffer.data() );
 
     TestDecoder
     size_t wideChars = wxWcslen( wideBuffer.data() );
 
     TestDecoder

-        ( 
-        wideBuffer.data(), 
+        (
+        wideBuffer.data(),

         wideChars,
         wideChars,

-        (const char*)multiBuffer, 
+        (const char*)multiBuffer,

         multiBytes,
         converter,
         sizeofNull
         );
     TestEncoder
         multiBytes,
         converter,
         sizeofNull
         );
     TestEncoder

-        ( 
-        wideBuffer.data(), 
+        (
+        wideBuffer.data(),

         wideChars,
         wideChars,

-        (const char*)multiBuffer, 
+        (const char*)multiBuffer,

         multiBytes,
         converter,
         sizeofNull
         multiBytes,
         converter,
         sizeofNull


@@ -774,12 +785,12 @@ void MBConvTestCase::TestCoder(
 }
 
 
 }
 
 

-WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const wxChar* name );
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const char* name );

 
 void MBConvTestCase::FontmapTests()
 {
 #ifdef wxUSE_FONTMAP
 
 void MBConvTestCase::FontmapTests()
 {
 #ifdef wxUSE_FONTMAP

-    wxMBConv* converter = new_wxMBConv_wxwin( _T("CP1252") );
+    wxMBConv* converter = new_wxMBConv_wxwin("CP1252");

     if ( !converter )
     {
         return;
     if ( !converter )
     {
         return;


@@ -789,7 +800,7 @@ void MBConvTestCase::FontmapTests()
         sizeof(CP1252),
         (const char*)CP1252_utf8,
         sizeof(CP1252_utf8),
         sizeof(CP1252),
         (const char*)CP1252_utf8,
         sizeof(CP1252_utf8),

-        converter,
+        *converter,

         1
         );
     delete converter;
         1
         );
     delete converter;


@@ -797,12 +808,12 @@ void MBConvTestCase::FontmapTests()
 }
 
 
 }
 
 

-WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name );
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const char* name );

 
 void MBConvTestCase::IconvTests()
 {
 #ifdef HAVE_ICONV
 
 void MBConvTestCase::IconvTests()
 {
 #ifdef HAVE_ICONV

-    wxMBConv* converter = new_wxMBConv_iconv( _T("CP932") );
+    wxMBConv* converter = new_wxMBConv_iconv("CP932");

     if ( !converter )
     {
         return;
     if ( !converter )
     {
         return;


@@ -812,13 +823,31 @@ void MBConvTestCase::IconvTests()
         sizeof(welcome_cp932),
         (const char*)welcome_utf8,
         sizeof(welcome_utf8),
         sizeof(welcome_cp932),
         (const char*)welcome_utf8,
         sizeof(welcome_utf8),

-        converter,
+        *converter,

         1
         );
     delete converter;
 #endif
 }
 
         1
         );
     delete converter;
 #endif
 }
 

+void MBConvTestCase::Latin1Tests()
+{
+    TestCoder(
+        (const char*)iso8859_1,
+        sizeof(iso8859_1),
+        (const char*)iso8859_1_utf8,
+        sizeof(iso8859_1_utf8),
+        wxConvISO8859_1,
+        1
+        );
+
+    static const char nulstr[] = "foo\0bar\0";
+    static const size_t mbLen = WXSIZEOF(nulstr) - 1;
+    size_t wcLen;
+    wxWCharBuffer wbuf(wxConvISO8859_1.cMB2WC(nulstr, mbLen, &wcLen));
+    CPPUNIT_ASSERT_EQUAL( mbLen, wcLen );
+}
+

 void MBConvTestCase::CP1252Tests()
 {
     wxCSConv convCP1252( wxFONTENCODING_CP1252 );
 void MBConvTestCase::CP1252Tests()
 {
     wxCSConv convCP1252( wxFONTENCODING_CP1252 );


@@ -827,7 +856,7 @@ void MBConvTestCase::CP1252Tests()
         sizeof(CP1252),
         (const char*)CP1252_utf8,
         sizeof(CP1252_utf8),
         sizeof(CP1252),
         (const char*)CP1252_utf8,
         sizeof(CP1252_utf8),

-        &convCP1252,
+        convCP1252,

         1
         );
 }
         1
         );
 }


@@ -854,11 +883,11 @@ void MBConvTestCase::LibcTests()
 #endif
     wxMBConvLibc convLibc;
     TestCoder(
 #endif
     wxMBConvLibc convLibc;
     TestCoder(

-        (const char*)systemMB, 
+        (const char*)systemMB,

         systemMB_size,
         systemMB_size,

-        (const char*)systemMB_utf8, 
+        (const char*)systemMB_utf8,

         systemMB_utf8_size,
         systemMB_utf8_size,

-        &convLibc,
+        convLibc,

         1
         );
 
         1
         );
 


@@ -871,7 +900,7 @@ void MBConvTestCase::TestDecoder(
     size_t         wideChars,   // the number of wide characters at wideBuffer
     const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
     size_t         wideChars,   // the number of wide characters at wideBuffer
     const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-    wxMBConv*      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence
+    wxMBConv&      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence

     int            sizeofNull   // number of bytes occupied by terminating null in this encoding
     )
 {
     int            sizeofNull   // number of bytes occupied by terminating null in this encoding
     )
 {


@@ -883,14 +912,14 @@ void MBConvTestCase::TestDecoder(
     memset( &inputCopy.data()[multiBytes], 0, sizeofNull );
 
     // calculate the output size
     memset( &inputCopy.data()[multiBytes], 0, sizeofNull );
 
     // calculate the output size

-    size_t outputWritten = converter->MB2WC
-        ( 
-        0, 
-        (const char*)inputCopy.data(), 
+    size_t outputWritten = converter.MB2WC
+        (
+        0,
+        (const char*)inputCopy.data(),

         0
         );
     // make sure the correct output length was calculated
         0
         );
     // make sure the correct output length was calculated

-    CPPUNIT_ASSERT( outputWritten == wideChars );
+    CPPUNIT_ASSERT_EQUAL( wideChars, outputWritten );

 
     // convert the string
     size_t guardChars = 8; // to make sure we're not overrunning the output buffer
 
     // convert the string
     size_t guardChars = 8; // to make sure we're not overrunning the output buffer


@@ -899,14 +928,14 @@ void MBConvTestCase::TestDecoder(
     wxWCharBuffer outputBuffer(outputBufferChars);
     memset( outputBuffer.data(), UNINITIALIZED, outputBufferChars*sizeof(wchar_t) );
 
     wxWCharBuffer outputBuffer(outputBufferChars);
     memset( outputBuffer.data(), UNINITIALIZED, outputBufferChars*sizeof(wchar_t) );
 

-    outputWritten = converter->MB2WC
-        ( 
-        outputBuffer.data(), 
-        (const char*)inputCopy.data(), 
+    outputWritten = converter.MB2WC
+        (
+        outputBuffer.data(),
+        (const char*)inputCopy.data(),

         outputBufferChars
         );
     // make sure the correct number of characters were outputs
         outputBufferChars
         );
     // make sure the correct number of characters were outputs

-    CPPUNIT_ASSERT( outputWritten == wideChars );
+    CPPUNIT_ASSERT_EQUAL( wideChars, outputWritten );

 
     // make sure the characters generated are correct
     CPPUNIT_ASSERT( 0 == memcmp( outputBuffer, wideBuffer, wideChars*sizeof(wchar_t) ) );
 
     // make sure the characters generated are correct
     CPPUNIT_ASSERT( 0 == memcmp( outputBuffer, wideBuffer, wideChars*sizeof(wchar_t) ) );


@@ -931,7 +960,7 @@ void MBConvTestCase::TestEncoder(
     size_t         wideChars,   // the number of wide characters at wideBuffer
     const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
     size_t         wideChars,   // the number of wide characters at wideBuffer
     const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-    wxMBConv*      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence
+    wxMBConv&      converter,   // the wxMBConv object that can decode multiBuffer into a wide character sequence

     int            sizeofNull   // number of bytes occupied by terminating null in this encoding
     )
 {
     int            sizeofNull   // number of bytes occupied by terminating null in this encoding
     )
 {


@@ -943,14 +972,14 @@ void MBConvTestCase::TestEncoder(
     inputCopy.data()[wideChars] = 0;
 
     // calculate the output size
     inputCopy.data()[wideChars] = 0;
 
     // calculate the output size

-    size_t outputWritten = converter->WC2MB
-        ( 
-        0, 
-        (const wchar_t*)inputCopy.data(), 
+    size_t outputWritten = converter.WC2MB
+        (
+        0,
+        (const wchar_t*)inputCopy.data(),

         0
         );
     // make sure the correct output length was calculated
         0
         );
     // make sure the correct output length was calculated

-    CPPUNIT_ASSERT( outputWritten == multiBytes );
+    CPPUNIT_ASSERT_EQUAL( multiBytes, outputWritten );

 
     // convert the string
     size_t guardBytes = 8; // to make sure we're not overrunning the output buffer
 
     // convert the string
     size_t guardBytes = 8; // to make sure we're not overrunning the output buffer


@@ -958,15 +987,15 @@ void MBConvTestCase::TestEncoder(
     wxCharBuffer outputBuffer(outputBufferSize);
     memset( outputBuffer.data(), UNINITIALIZED, outputBufferSize );
 
     wxCharBuffer outputBuffer(outputBufferSize);
     memset( outputBuffer.data(), UNINITIALIZED, outputBufferSize );
 

-    outputWritten = converter->WC2MB
-        ( 
-        outputBuffer.data(), 
-        (const wchar_t*)inputCopy.data(), 
-        outputBufferSize 
+    outputWritten = converter.WC2MB
+        (
+        outputBuffer.data(),
+        (const wchar_t*)inputCopy.data(),
+        outputBufferSize

         );
 
     // make sure the correct number of characters were output
         );
 
     // make sure the correct number of characters were output

-    CPPUNIT_ASSERT( outputWritten == multiBytes );
+    CPPUNIT_ASSERT_EQUAL( multiBytes, outputWritten );

 
     // make sure the characters generated are correct
     CPPUNIT_ASSERT( 0 == memcmp( outputBuffer, multiBuffer, multiBytes ) );
 
     // make sure the characters generated are correct
     CPPUNIT_ASSERT( 0 == memcmp( outputBuffer, multiBuffer, multiBytes ) );


@@ -998,18 +1027,22 @@ void MBConvTestCase::TestStreamDecoder(
                                        size_t         wideChars,   // the number of wide characters at wideBuffer
                                        const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
                                        size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
                                        size_t         wideChars,   // the number of wide characters at wideBuffer
                                        const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
                                        size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-                                       wxMBConv*      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence
+                                       wxMBConv&      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence

                                        )
 {
     // this isn't meant to test wxMemoryInputStream or wxTextInputStream
     // it's meant to test the way wxTextInputStream uses wxMBConv
     // (which has exposed some problems with wxMBConv)
     wxMemoryInputStream memoryInputStream( multiBuffer, multiBytes );
                                        )
 {
     // this isn't meant to test wxMemoryInputStream or wxTextInputStream
     // it's meant to test the way wxTextInputStream uses wxMBConv
     // (which has exposed some problems with wxMBConv)
     wxMemoryInputStream memoryInputStream( multiBuffer, multiBytes );

-    wxTextInputStream textInputStream( memoryInputStream, wxT(""), *converter );
+    wxTextInputStream textInputStream( memoryInputStream, wxT(""), converter );

     for ( size_t i = 0; i < wideChars; i++ )
     {
         wxChar wc = textInputStream.GetChar();
     for ( size_t i = 0; i < wideChars; i++ )
     {
         wxChar wc = textInputStream.GetChar();

-        CPPUNIT_ASSERT( wc == wideBuffer[i] );
+        CPPUNIT_ASSERT_EQUAL_MESSAGE(
+            std::string(wxString::Format("At position %lu", (unsigned long)i)),
+            wideBuffer[i],
+            wc
+        );

     }
     CPPUNIT_ASSERT( 0 == textInputStream.GetChar() );
     CPPUNIT_ASSERT( memoryInputStream.Eof() );
     }
     CPPUNIT_ASSERT( 0 == textInputStream.GetChar() );
     CPPUNIT_ASSERT( memoryInputStream.Eof() );


@@ -1024,7 +1057,7 @@ void MBConvTestCase::TestStreamEncoder(
     size_t         wideChars,   // the number of wide characters at wideBuffer
     const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"
     size_t         wideChars,   // the number of wide characters at wideBuffer
     const char*    multiBuffer, // a multibyte encoded character sequence that can be decoded by "converter"
     size_t         multiBytes,  // the byte length of the multibyte character sequence that can be decoded by "converter"

-    wxMBConv*      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence
+    wxMBConv&      converter    // the wxMBConv object that can decode multiBuffer into a wide character sequence

     )
 {
     // this isn't meant to test wxMemoryOutputStream or wxTextOutputStream
     )
 {
     // this isn't meant to test wxMemoryOutputStream or wxTextOutputStream


@@ -1032,15 +1065,18 @@ void MBConvTestCase::TestStreamEncoder(
     // (which has exposed some problems with wxMBConv)
     wxMemoryOutputStream memoryOutputStream;
     // wxEOL_UNIX will pass \n \r unchanged
     // (which has exposed some problems with wxMBConv)
     wxMemoryOutputStream memoryOutputStream;
     // wxEOL_UNIX will pass \n \r unchanged

-    wxTextOutputStream textOutputStream( memoryOutputStream, wxEOL_UNIX, *converter );
+    wxTextOutputStream textOutputStream( memoryOutputStream, wxEOL_UNIX, converter );

     for ( size_t i = 0; i < wideChars; i++ )
     {
         textOutputStream.PutChar( wideBuffer[i] );
     }
     for ( size_t i = 0; i < wideChars; i++ )
     {
         textOutputStream.PutChar( wideBuffer[i] );
     }

-    CPPUNIT_ASSERT( memoryOutputStream.TellO() == multiBytes );
+
+    textOutputStream.Flush();
+
+    CPPUNIT_ASSERT_EQUAL( (wxFileOffset)multiBytes, memoryOutputStream.TellO() );

     wxCharBuffer copy( memoryOutputStream.TellO() );
     memoryOutputStream.CopyTo( copy.data(), memoryOutputStream.TellO());
     wxCharBuffer copy( memoryOutputStream.TellO() );
     memoryOutputStream.CopyTo( copy.data(), memoryOutputStream.TellO());

-    CPPUNIT_ASSERT( 0 == memcmp( copy.data(), multiBuffer, multiBytes ) );
+    CPPUNIT_ASSERT_EQUAL( 0, memcmp( copy.data(), multiBuffer, multiBytes ) );

 }
 #endif
 
 }
 #endif
 


@@ -1090,7 +1126,7 @@ void MBConvTestCase::UTF8Octal(const char *charSequence,
 //
 static wchar_t *wx_wcscpy(wchar_t *dest, const wchar_t *src)
 {
 //
 static wchar_t *wx_wcscpy(wchar_t *dest, const wchar_t *src)
 {

-    wchar_t *d = dest; 
+    wchar_t *d = dest;

     while ((*d++ = *src++) != 0)
         ;
     return dest;
     while ((*d++ = *src++) != 0)
         ;
     return dest;


@@ -1100,7 +1136,7 @@ static wchar_t *wx_wcscpy(wchar_t *dest, const wchar_t *src)
 //
 static wchar_t *wx_wcscat(wchar_t *dest, const wchar_t *src)
 {
 //
 static wchar_t *wx_wcscat(wchar_t *dest, const wchar_t *src)
 {

-    wchar_t *d = dest; 
+    wchar_t *d = dest;

     while (*d)
         d++;
     while ((*d++ = *src++) != 0)
     while (*d)
         d++;
     while ((*d++ = *src++) != 0)


@@ -1143,12 +1179,12 @@ void MBConvTestCase::UTF8(const char *charSequence,
     const size_t BUFSIZE = 128;
     wxASSERT(strlen(charSequence) * 3 + 10 < BUFSIZE);
     char bytes[BUFSIZE];
     const size_t BUFSIZE = 128;
     wxASSERT(strlen(charSequence) * 3 + 10 < BUFSIZE);
     char bytes[BUFSIZE];

-    
+

     // include the option in the error messages so it's possible to see
     // which test failed
     sprintf(bytes, " (with option == %d)", option);
     std::string errmsg(bytes);
     // include the option in the error messages so it's possible to see
     // which test failed
     sprintf(bytes, " (with option == %d)", option);
     std::string errmsg(bytes);

-    
+

     // put the charSequence at the start, middle and end of a string
     strcpy(bytes, charSequence);
     strcat(bytes, "ABC");
     // put the charSequence at the start, middle and end of a string
     strcpy(bytes, charSequence);
     strcat(bytes, "ABC");