fixed problems with sometimes processing the events twice introduced in rev 1.170...

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

diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp
index 476798911f0ab5bc727294adbd165b45071a4bed..af3bd9ec782c3baafa48dd6932443721b50991c8 100644 (file)
--- a/src/os2/fontenum.cpp
+++ b/src/os2/fontenum.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "fontenum.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -32,6 +28,7 @@
 
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
+#include "wx/encinfo.h"
 
 #include "wx/os2/private.h"
 
@@ -65,7 +62,7 @@ private:
     // if not empty, enum only the fonts with this facename
     wxString m_facename;
 
-    // if TRUE, enum only fixed fonts
+    // if true, enum only fixed fonts
     bool m_fixedOnly;
 };
 
@@ -99,7 +96,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;
@@ -108,7 +105,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     m_charset = info.charset;
     m_facename = info.facename;
 
-    return TRUE;
+    return true;
 }
 
 #define wxFONTENUMPROC FONTENUMPROC
@@ -152,7 +149,7 @@ bool wxFontEnumeratorHelper::OnFont(/*const LPLOGFONT lf,
         if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
         {
             // not a fixed pitch font
-            return TRUE;
+            return true;
         }
     }
 
@@ -161,13 +158,13 @@ bool wxFontEnumeratorHelper::OnFont(/*const LPLOGFONT lf,
         // check that we have the right encoding
         if ( lf->lfCharSet != m_charset )
         {
-            return TRUE;
+            return true;
         }
     }
 
     return m_fontEnum->OnFacename(lf->lfFaceName);
    */
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -186,14 +183,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
     }
     // else: no such fonts, unknown encoding
 
-    return TRUE;
+    return true;
 }
 
-bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
+bool wxFontEnumerator::EnumerateEncodings(const wxString& WXUNUSED(family))
 {
     wxFAIL_MSG(wxT("TODO"));
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------