X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8899b155a1e4fa5f4b90e1f3bebe28088ea46bc9..0d2c444336913d7144bd47f78e3e04e425dec8e4:/tests/fontmap/fontmaptest.cpp diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp index 212f64c434..ea36961c17 100644 --- a/tests/fontmap/fontmaptest.cpp +++ b/tests/fontmap/fontmaptest.cpp @@ -5,6 +5,7 @@ // Created: 14.02.04 // RCS-ID: $Id$ // Copyright: (c) 2003 TT-Solutions +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- @@ -91,7 +92,7 @@ void FontMapperTestCase::NamesAndDesc() static const wxChar *descriptions[] = { - // some vali charsets + // some valid charsets _T("Default encoding" ), _T("Western European (ISO-8859-1)" ), _T("Indian (ISO-8859-12)" ), @@ -109,9 +110,9 @@ void FontMapperTestCase::NamesAndDesc() 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] ); + wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(charsets[n]); + CPPUNIT_ASSERT( wxFontMapperBase::Get()->GetEncodingName(enc).CmpNoCase(names[n]) == 0 ); + CPPUNIT_ASSERT( wxFontMapperBase::Get()->GetEncodingDescription(enc) == descriptions[n] ); } }