Applied patch 1055774 from Paul Cornett for platforms

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 4c5392c094c00b6195ff861c0688462ed95708d7..4ba3e6512d8da4a2903d58064218a170c1ab41b9 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -17,29 +17,35 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "fontenum.h"
 #endif
 
     #pragma implementation "fontenum.h"
 #endif
 

-#include "wx/defs.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/regex.h"
 #include "wx/utils.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/regex.h"
 #include "wx/utils.h"

-
+#include "wx/app.h"

 #include "wx/fontmap.h"
 #include "wx/fontenum.h"
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/fontenum.h"
 #include "wx/fontutil.h"

+#include "wx/encinfo.h"

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// GTK 2.0
+// Pango

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK20__
+#if wxUSE_PANGO

 
 

-#include "wx/gtk/private.h"
+#include "pango/pango.h"

 
 

+#ifdef __WXGTK20__
+#include "gtk/gtk.h"

 extern GtkWidget *wxGetRootWindow();
 extern GtkWidget *wxGetRootWindow();

+#endif

 
 static int
 cmp_families (const void *a, const void *b)
 
 static int
 cmp_families (const void *a, const void *b)


@@ -54,25 +60,35 @@ cmp_families (const void *a, const void *b)
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {

+#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE

     if ( fixedWidthOnly )
     {
     if ( fixedWidthOnly )
     {

-        OnFacename( wxT("monospaced") );
+        OnFacename( wxT("monospace") );

     }
     else
     }
     else

+#endif

     {
         PangoFontFamily **families = NULL;
         gint n_families = 0;
         pango_context_list_families ( 
     {
         PangoFontFamily **families = NULL;
         gint n_families = 0;
         pango_context_list_families ( 

+#ifdef __WXGTK20__

             gtk_widget_get_pango_context( wxGetRootWindow() ),
             gtk_widget_get_pango_context( wxGetRootWindow() ),

+#else
+            wxTheApp->GetPangoContext(),
+#endif

             &families, &n_families );
         qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);
 
         for (int i=0; i<n_families; i++)
         {
             &families, &n_families );
         qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);
 
         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));
+            }

         }
     }
     
         }
     }
     


@@ -86,7 +102,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
 
 #else
 
 
 #else

-  // GTK 2.0
+  // Pango

 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here
 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here