GetId of wxTreeItemData returns a wxTreeItemId, not a wxTreeItem. From the wiki...

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

diff --git a/tests/mbconv/main.cpp b/tests/mbconv/main.cpp
index d5689628629ec5375a23560a63fceb9c5d2c53a4..6c509c838ddb354f85f3a1ef3258bbf87099f4d5 100644 (file)
--- a/tests/mbconv/main.cpp
+++ b/tests/mbconv/main.cpp
@@ -24,10 +24,6 @@
 #include "wx/strconv.h"
 #include "wx/string.h"
 
-#if wxUSE_FONTMAP
-    #include "wx/fontmap.h"
-#endif // wxUSE_FONTMAP
-
 #include "wx/cppunit.h"
 
 // ----------------------------------------------------------------------------
@@ -42,11 +38,9 @@ public:
 private:
     CPPUNIT_TEST_SUITE( MBConvTestCase );
         CPPUNIT_TEST( WC2CP1250 );
-        CPPUNIT_TEST( Charsets );
     CPPUNIT_TEST_SUITE_END();
 
     void WC2CP1250();
-    void Charsets();
 
     DECLARE_NO_COPY_CLASS(MBConvTestCase)
 };
@@ -66,7 +60,7 @@ void MBConvTestCase::WC2CP1250()
     } data[] =
     {
         { L"hello", "hello" },  // test that it works in simplest case
-        { L"½ of ½ is ¼", NULL }, // this should fail as cp1250 doesn't have 1/2
+        { L"\xBD of \xBD is \xBC", NULL }, // this should fail as cp1250 doesn't have 1/2
     };
 
     wxCSConv cs1250(wxFONTENCODING_CP1250);
@@ -83,71 +77,3 @@ void MBConvTestCase::WC2CP1250()
         }
     }
 }
-
-void MBConvTestCase::Charsets()
-{
-#if wxUSE_FONTMAP
-
-    static const wxChar *charsets[] =
-    {
-        // some vali charsets
-        _T("us-ascii"    ),
-        _T("iso8859-1"   ),
-        _T("iso-8859-12" ),
-        _T("koi8-r"      ),
-        _T("utf-7"       ),
-        _T("cp1250"      ),
-        _T("windows-1252"),
-
-        // and now some bogus ones
-        _T(""            ),
-        _T("cp1249"      ),
-        _T("iso--8859-1" ),
-        _T("iso-8859-19" ),
-    };
-
-    static const wxChar *names[] =
-    {
-        // some vali charsets
-        _T("default"     ),
-        _T("iso-8859-1"  ),
-        _T("iso-8859-12" ),
-        _T("koi8-r"      ),
-        _T("utf-7"       ),
-        _T("windows-1250"),
-        _T("windows-1252"),
-
-        // and now some bogus ones
-        _T("default"     ),
-        _T("unknown--1"  ),
-        _T("unknown--1"  ),
-        _T("unknown--1"  ),
-    };
-
-    static const wxChar *descriptions[] =
-    {
-        // some vali charsets
-        _T("Default encoding"                  ),
-        _T("Western European (ISO-8859-1)"     ),
-        _T("Indian (ISO-8859-12)"              ),
-        _T("KOI8-R"                            ),
-        _T("Unicode 7 bit (UTF-7)"             ),
-        _T("Windows Central European (CP 1250)"),
-        _T("Windows Western European (CP 1252)"),
-
-        // and now some bogus ones
-        _T("Default encoding"                  ),
-        _T("Unknown encoding (-1)"             ),
-        _T("Unknown encoding (-1)"             ),
-        _T("Unknown encoding (-1)"             ),
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
-    {
-        wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charsets[n]);
-        CPPUNIT_ASSERT( wxFontMapper::Get()->GetEncodingName(enc) == names[n] );
-        CPPUNIT_ASSERT( wxFontMapper::Get()->GetEncodingDescription(enc) == descriptions[n] );
-    }
-
-#endif // wxUSE_FONTMAP
-}