fixed a memory leak and an initialization problem

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

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index 39c0d8548d1c06eb79e52298c41eb2ff742afbe7..fe12e118393a9ae102f58728a39cd270a7fd4e18 100644 (file)
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -29,6 +29,7 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
@@ -331,9 +332,9 @@ void wxFillLogFont(
                                  ,&vInfo
                                 ))
     {
-        if ( !wxTheFontMapper->GetAltForEncoding( vEncoding
-                                                 ,&vInfo
-                                                ))
+#if wxUSE_FONTMAP
+        if (!wxTheFontMapper->GetAltForEncoding(vEncoding, &vInfo))
+#endif // wxUSE_FONTMAP
         {
             //
             // Unsupported encoding, replace with the default