compilation fix for systems with XtIMSignal

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 869a546f3923991afaa5a5bef2f99ad46c45bf4e..3b9be3e2cb62c030f41c4372b8373ebc6467b954 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -32,6 +32,7 @@
 #include "wx/fontmap.h"
 #include "wx/fontenum.h"
 #include "wx/fontutil.h"
+#include "wx/encinfo.h"
 
 // ----------------------------------------------------------------------------
 // Pango
@@ -51,7 +52,7 @@ cmp_families (const void *a, const void *b)
 {
   const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
   const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);
-  
+
   return g_utf8_collate (a_name, b_name);
 }
 
@@ -59,11 +60,13 @@ cmp_families (const void *a, const void *b)
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
+#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
     if ( fixedWidthOnly )
     {
         OnFacename( wxT("monospace") );
     }
     else
+#endif
     {
         PangoFontFamily **families = NULL;
         gint n_families = 0;
@@ -78,11 +81,16 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
         for (int i=0; i<n_families; i++)
         {
-            const gchar *name = pango_font_family_get_name( families[i] );
-            
-            wxString tmp( name, wxConvUTF8 );
-            OnFacename( tmp );
+#ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+            if (!fixedWidthOnly ||
+                pango_font_family_is_monospace(families[i]))
+#endif
+            {
+                const gchar *name = pango_font_family_get_name(families[i]);
+                OnFacename(wxString(name, wxConvUTF8));
+            }
         }
+        g_free(families);
     }
     
     return TRUE;