X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b578601e3e0a6bb1cfdbbfe9aaee19a1331f97a8..de63b922cadc81306a1905c81cfd0be7ae32adbb:/src/unix/fontenum.cpp diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index 3b9be3e2cb..0496afeeef 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "fontenum.h" -#endif - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -45,10 +41,10 @@ #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); @@ -60,30 +56,38 @@ cmp_families (const void *a, const void *b) bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool fixedWidthOnly) { -#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE - if ( fixedWidthOnly ) - { +#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 -#endif +#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); @@ -209,7 +213,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, //else: already seen } - return TRUE; + return true; } #endif // wxUSE_NANOX @@ -222,14 +226,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 ) { @@ -240,13 +244,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 @@ -260,14 +264,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 } @@ -275,11 +279,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; @@ -289,7 +293,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) if ( !fonts ) { // unknown family? - return FALSE; + return false; } // extract the list of (unique) encodings @@ -309,7 +313,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; @@ -340,10 +344,9 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) XFreeFontNames(fonts); - return TRUE; + return true; #endif // wxUSE_NANOX } -#endif - // __WXGTK20__ +#endif // !wxUSE_PANGO