unicode fixes, enabling notebook images again

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

diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp
index b74beb093930ada3a1e5316b52f3fda0183c62c5..26a10439326f4a72737550f41654ecb0cb9fd362 100644 (file)
--- a/src/os2/fontenum.cpp
+++ b/src/os2/fontenum.cpp
@@ -17,9 +17,15 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#ifdef __GNUG__
+    #pragma implementation "fontenum.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_FONTMAP
+
 #ifndef WX_PRECOMP
   #include "wx/font.h"
 #endif
@@ -93,7 +99,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     wxNativeEncodingInfo info;
     if ( !wxGetNativeFontEncoding(encoding, &info) )
     {
-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
         {
             // no such encodings at all
             return FALSE;
@@ -212,3 +218,4 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 }
 */
 
+#endif // wxUSE_FONTMAP