[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index c68984623b1d6588d64ec324aa48e48b200e7a6e..4ba3e6512d8da4a2903d58064218a170c1ab41b9 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -17,19 +17,92 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #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/regex.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/encinfo.h"
+
+// ----------------------------------------------------------------------------
+// Pango
+// ----------------------------------------------------------------------------
+
+#if wxUSE_PANGO
+
+#include "pango/pango.h"
+
+#ifdef __WXGTK20__
+#include "gtk/gtk.h"
+extern GtkWidget *wxGetRootWindow();
+#endif
+
+static int
+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);
+}
+
+// I admit I don't yet understand encodings with Pango
+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;
+        pango_context_list_families ( 
+#ifdef __WXGTK20__
+            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++)
+        {
+#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));
+            }
+        }
+    }
+    
+    return TRUE;
+}
+
+bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
+{
+    return FALSE;
+}
+
+
+#else
+  // Pango
 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here
@@ -67,6 +140,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // helpers
 // ----------------------------------------------------------------------------
 
+#if !wxUSE_NANOX
 static char **CreateFontList(wxChar spacing,
                              wxFontEncoding encoding,
                              int *nFonts)
@@ -78,7 +152,7 @@ static char **CreateFontList(wxChar spacing,
     if ( !wxTestFontEncoding(info) )
     {
         // ask font mapper for a replacement
-        (void)wxTheFontMapper->GetAltForEncoding(encoding, &info);
+        (void)wxFontMapper::Get()->GetAltForEncoding(encoding, &info);
     }
 #endif // wxUSE_FONTMAP
 
@@ -106,7 +180,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
     {
         char *font = fonts[n];
 #if wxUSE_REGEX
-        if ( re.Matches(font) )
+        if ( !re.Matches(font) )
 #else // !wxUSE_REGEX
         if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
 #endif // wxUSE_REGEX/!wxUSE_REGEX
@@ -136,6 +210,8 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 
     return TRUE;
 }
+#endif
+  // wxUSE_NANOX
 
 // ----------------------------------------------------------------------------
 // wxFontEnumerator
@@ -144,6 +220,9 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
+#if wxUSE_NANOX
+    return FALSE;
+#else
     int nFonts;
     char **fonts;
 
@@ -187,12 +266,16 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
     (void)ProcessFamiliesFromFontList(this, fonts, nFonts);
 
     XFreeFontNames(fonts);
-
     return TRUE;
+#endif
+    // wxUSE_NANOX
 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
+#if wxUSE_NANOX
+    return FALSE;
+#else
     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
                    family.IsEmpty() ? wxT("*") : family.c_str());
@@ -257,4 +340,9 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     XFreeFontNames(fonts);
 
     return TRUE;
+#endif
+    // wxUSE_NANOX
 }
+
+#endif
+   // __WXGTK20__