removed 68K targets and preferences and renamed output libraries

[wxWidgets.git] / src / os2 / fontenum.cpp

diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp
index 00454cee9bf07d93bfa171a2e3d1f13126bfb31a..26a10439326f4a72737550f41654ecb0cb9fd362 100644 (file)
--- a/src/os2/fontenum.cpp
+++ b/src/os2/fontenum.cpp
@@ -24,6 +24,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_FONTMAP
+

 #ifndef WX_PRECOMP
   #include "wx/font.h"
 #endif
 #ifndef WX_PRECOMP
   #include "wx/font.h"
 #endif


@@ -97,7 +99,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     wxNativeEncodingInfo info;
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
     wxNativeEncodingInfo info;
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {

-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )

         {
             // no such encodings at all
             return FALSE;
         {
             // no such encodings at all
             return FALSE;


@@ -216,3 +218,4 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 }
 */
 
 }
 */
 

+#endif // wxUSE_FONTMAP