- wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(charsets[n]);
- CPPUNIT_ASSERT( wxFontMapperBase::Get()->GetEncodingName(enc) == names[n] );
- CPPUNIT_ASSERT( wxFontMapperBase::Get()->GetEncodingDescription(enc) == descriptions[n] );
+ wxFontEncoding enc = fmap.CharsetToEncoding(charsets[n]);
+ CPPUNIT_ASSERT_EQUAL( names[n], fmap.GetEncodingName(enc).Lower() );
+ CPPUNIT_ASSERT_EQUAL( descriptions[n], fmap.GetEncodingDescription(enc) );