]> git.saurik.com Git - wxWidgets.git/blobdiff - tests/fontmap/fontmaptest.cpp
Warning fix for wxUSE_LOG off.
[wxWidgets.git] / tests / fontmap / fontmaptest.cpp
index b267f0d04ed7102dc2a424be005282ac5119815c..c5aa0a8d45cc2be7d2bda7e88dfde362aba13f31 100644 (file)
@@ -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] );
     }
 }