X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1acca470dfb55b82553af6cdb0c88b3b3a1eb00b..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/unix/fontenum.cpp diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index 25ab081632..b7a026e5b6 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -20,6 +20,8 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_FONTENUM + #include "wx/fontenum.h" #ifndef WX_PRECOMP @@ -66,77 +68,36 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, return false; } -#if defined(__WXGTK20__) || !defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE) - if ( fixedWidthOnly -#if defined(__WXGTK24__) - && (gtk_check_version(2,4,0) != NULL) -#endif - ) - { - OnFacename( wxT("monospace") ); - } - else // !fixedWidthOnly -#endif // __WXGTK20__ || !HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE - { - 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(), + wxTheApp->GetPangoContext(), #endif - &families, &n_families ); - qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareFamilies); + &families, &n_families ); + qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareFamilies); - for (int i=0; i