X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1d7cbac4369e180a8d7c19f386b301196d09369..0dbfd66d0b35352a0f60e7190b72815052b3d2d4:/src/unix/fontenum.cpp

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index c68984623b..fdeb46a105 100644
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -23,8 +23,8 @@
 
 #include "wx/defs.h"
 #include "wx/dynarray.h"
-#include "wx/regex.h"
 #include "wx/string.h"
+#include "wx/regex.h"
 #include "wx/utils.h"
 
 #include "wx/fontmap.h"
@@ -67,6 +67,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // helpers
 // ----------------------------------------------------------------------------
 
+#if !wxUSE_NANOX
 static char **CreateFontList(wxChar spacing,
                              wxFontEncoding encoding,
                              int *nFonts)
@@ -78,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
 
@@ -106,7 +107,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
     {
         char *font = fonts[n];
 #if wxUSE_REGEX
-        if ( re.Matches(font) )
+        if ( !re.Matches(font) )
 #else // !wxUSE_REGEX
         if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
 #endif // wxUSE_REGEX/!wxUSE_REGEX
@@ -136,6 +137,8 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 
     return TRUE;
 }
+#endif
+  // wxUSE_NANOX
 
 // ----------------------------------------------------------------------------
 // wxFontEnumerator
@@ -144,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;
 
@@ -187,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());
@@ -257,4 +267,6 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     XFreeFontNames(fonts);
 
     return TRUE;
+#endif
+    // wxUSE_NANOX
 }