wxTipWindow can now derived from wxFrame if not wxUSE_POPUPWIN, or

[wxWidgets.git] / src / unix / fontenum.cpp

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index 5cd8a2698110f80b618ec33630dc228f9664605f..63bcf5c4fccfa7a144b5c91ccb0a5a8a220d1194 100644 (file)
--- 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/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"

+#include "wx/regex.h"

 #include "wx/utils.h"
 
 #include "wx/fontmap.h"
 #include "wx/utils.h"
 
 #include "wx/fontmap.h"


@@ -95,12 +96,20 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts)
 {
                                         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];
     // 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("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
         if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )

+#endif // wxUSE_REGEX/!wxUSE_REGEX

         {
             // it's not a full font name (probably an alias)
             continue;
         {
             // it's not a full font name (probably an alias)
             continue;