X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..5a1e0e91a1ca5ec98b0eeb335cda757d1261ed08:/src/unix/fontenum.cpp?ds=sidebyside diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index f1181a4aa7..dc50c9b740 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -17,19 +17,24 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontenum.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_FONTENUM + +#include "wx/fontenum.h" + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/string.h" + #include "wx/app.h" + #include "wx/utils.h" #endif -#include "wx/defs.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" // ---------------------------------------------------------------------------- // Pango @@ -42,58 +47,78 @@ #ifdef __WXGTK20__ #include "gtk/gtk.h" extern GtkWidget *wxGetRootWindow(); -#endif +#endif // __WXGTK20__ -static int -cmp_families (const void *a, const void *b) +extern "C" int wxCMPFUNC_CONV +wxCompareFamilies (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) { - if ( fixedWidthOnly ) + if ( encoding != wxFONTENCODING_SYSTEM && encoding != wxFONTENCODING_UTF8 ) + { + // Pango supports only UTF-8 encoding (and system means any, so we + // accept it too) + 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 + else // !fixedWidthOnly +#endif // __WXGTK20__ || !HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE { PangoFontFamily **families = NULL; gint n_families = 0; - pango_context_list_families ( + 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); + qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareFamilies); for (int i=0; iOnFacename(fam) ) { // stop enumerating - return FALSE; + return false; } families.Add(fam); @@ -199,7 +225,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, //else: already seen } - return TRUE; + return true; } #endif // wxUSE_NANOX @@ -212,14 +238,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool fixedWidthOnly) { #if wxUSE_NANOX - return FALSE; + return false; #else int nFonts; char **fonts; if ( fixedWidthOnly ) { - bool cont = TRUE; + bool cont = true; fonts = CreateFontList(wxT('m'), encoding, &nFonts); if ( fonts ) { @@ -230,13 +256,13 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, if ( !cont ) { - return TRUE; + return true; } fonts = CreateFontList(wxT('c'), encoding, &nFonts); if ( !fonts ) { - return TRUE; + return true; } } else @@ -250,14 +276,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM, wxT("No fonts at all on this system?")); - return FALSE; + return false; } } (void)ProcessFamiliesFromFontList(this, fonts, nFonts); XFreeFontNames(fonts); - return TRUE; + return true; #endif // wxUSE_NANOX } @@ -265,11 +291,11 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool wxFontEnumerator::EnumerateEncodings(const wxString& family) { #if wxUSE_NANOX - return FALSE; + return false; #else wxString pattern; pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"), - family.IsEmpty() ? wxT("*") : family.c_str()); + family.empty() ? wxT("*") : family.c_str()); // get the list of all fonts int nFonts; @@ -279,7 +305,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) if ( !fonts ) { // unknown family? - return FALSE; + return false; } // extract the list of (unique) encodings @@ -299,7 +325,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) dash = strchr(familyFont, '-'); *dash = '\0'; // !NULL because Matches() above succeeded - if ( !family.IsEmpty() && (family != familyFont) ) + if ( !family.empty() && (family != familyFont) ) { // family doesn't match continue; @@ -330,10 +356,11 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) XFreeFontNames(fonts); - return TRUE; + return true; #endif // wxUSE_NANOX } -#endif - // __WXGTK20__ +#endif // !wxUSE_PANGO + +#endif // wxUSE_FONTENUM