X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..40de795fb9d55f137a94ff607db9641a7383b558:/src/unix/fontenum.cpp diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index 5cd8a26981..fdeb46a105 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -24,6 +24,7 @@ #include "wx/defs.h" #include "wx/dynarray.h" #include "wx/string.h" +#include "wx/regex.h" #include "wx/utils.h" #include "wx/fontmap.h" @@ -66,6 +67,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, // helpers // ---------------------------------------------------------------------------- +#if !wxUSE_NANOX static char **CreateFontList(wxChar spacing, wxFontEncoding encoding, int *nFonts) @@ -77,7 +79,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 @@ -95,12 +97,20 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, char **fonts, int nFonts) { +#if wxUSE_REGEX + wxRegEx re(wxT("^(-[^-]*){14}$"), wxRE_NOSUB); +#endif // wxUSE_REGEX + // extract the list of (unique) font families wxSortedArrayString families; for ( int n = 0; n < nFonts; n++ ) { char *font = fonts[n]; +#if wxUSE_REGEX + if ( !re.Matches(font) ) +#else // !wxUSE_REGEX if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) ) +#endif // wxUSE_REGEX/!wxUSE_REGEX { // it's not a full font name (probably an alias) continue; @@ -127,6 +137,8 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, return TRUE; } +#endif + // wxUSE_NANOX // ---------------------------------------------------------------------------- // wxFontEnumerator @@ -135,6 +147,9 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This, bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool fixedWidthOnly) { +#if wxUSE_NANOX + return FALSE; +#else int nFonts; char **fonts; @@ -178,12 +193,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()); @@ -248,4 +267,6 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) XFreeFontNames(fonts); return TRUE; +#endif + // wxUSE_NANOX }