X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9e994615409e36d441135e4fa0761cf0398a2aa..d6b47de61b0a03dd31d582b37a9d45f99ec1a245:/tests/fontmap/fontmaptest.cpp diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp index b267f0d04e..c5aa0a8d45 100644 --- a/tests/fontmap/fontmaptest.cpp +++ b/tests/fontmap/fontmaptest.cpp @@ -11,7 +11,7 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/wxprec.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -25,8 +25,6 @@ #include "wx/fontmap.h" -#include "wx/cppunit.h" - // ---------------------------------------------------------------------------- // test class // ---------------------------------------------------------------------------- @@ -111,9 +109,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) == names[n] ); + CPPUNIT_ASSERT( wxFontMapperBase::Get()->GetEncodingDescription(enc) == descriptions[n] ); } }