Cleanup

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 4c5392c094c00b6195ff861c0688462ed95708d7..94520acb8d1d4a6f730a85285bf0b26778a77728 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -17,29 +17,35 @@
 // 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/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"
 
 // ----------------------------------------------------------------------------
-// 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();
+#endif
 
 static int
 cmp_families (const void *a, const void *b)
@@ -56,14 +62,18 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 {
     if ( fixedWidthOnly )
     {
-        OnFacename( wxT("monospaced") );
+        OnFacename( wxT("monospace") );
     }
     else
     {
         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);
 
@@ -86,7 +96,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
 
 #else
-  // GTK 2.0
+  // Pango
 
 #ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
                // The resulting warnings are switched off here