X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..3a922bb4bd8dbcb04e31e324648c2912e167e0cd:/src/unix/fontenum.cpp?ds=inline diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp index e8a9c18f75..63bcf5c4fc 100644 --- a/src/unix/fontenum.cpp +++ b/src/unix/fontenum.cpp @@ -24,12 +24,21 @@ #include "wx/defs.h" #include "wx/dynarray.h" #include "wx/string.h" +#include "wx/regex.h" #include "wx/utils.h" +#include "wx/fontmap.h" #include "wx/fontenum.h" #include "wx/fontutil.h" +#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++ + // The resulting warnings are switched off here +#pragma message disable nosimpint +#endif #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif // ---------------------------------------------------------------------------- // private functions @@ -65,6 +74,14 @@ static char **CreateFontList(wxChar spacing, wxNativeEncodingInfo info; wxGetNativeFontEncoding(encoding, &info); +#if wxUSE_FONTMAP + if ( !wxTestFontEncoding(info) ) + { + // ask font mapper for a replacement + (void)wxTheFontMapper->GetAltForEncoding(encoding, &info); + } +#endif // wxUSE_FONTMAP + wxString pattern; pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"), spacing, @@ -79,12 +96,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;