Applied patch #1190796 (Further accelerator changes).

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

diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp
index 00454cee9bf07d93bfa171a2e3d1f13126bfb31a..d85e98f18e0ebca2bf72ec50081704061077a932 100644 (file)
--- a/src/os2/fontenum.cpp
+++ b/src/os2/fontenum.cpp
@@ -24,12 +24,15 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_FONTMAP
+
 #ifndef WX_PRECOMP
   #include "wx/font.h"
 #endif
 
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
+#include "wx/encinfo.h"
 
 #include "wx/os2/private.h"
 
@@ -97,7 +100,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;
@@ -216,3 +219,4 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 }
 */
 
+#endif // wxUSE_FONTMAP