typo fixed: should be lpthread, not -lpthread in THREAD_OPTS

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

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

+#include "wx/regex.h"

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

+#include "wx/fontmap.h"

 #include "wx/fontenum.h"
 #include "wx/fontutil.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 <X11/Xlib.h>
 #include <X11/Xlib.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -58,6 +67,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

+#if !wxUSE_NANOX

 static char **CreateFontList(wxChar spacing,
                              wxFontEncoding encoding,
                              int *nFonts)
 static char **CreateFontList(wxChar spacing,
                              wxFontEncoding encoding,
                              int *nFonts)


@@ -65,6 +75,14 @@ static char **CreateFontList(wxChar spacing,
     wxNativeEncodingInfo info;
     wxGetNativeFontEncoding(encoding, &info);
 
     wxNativeEncodingInfo info;
     wxGetNativeFontEncoding(encoding, &info);
 

+#if wxUSE_FONTMAP
+    if ( !wxTestFontEncoding(info) )
+    {
+        // ask font mapper for a replacement
+        (void)wxFontMapper::Get()->GetAltForEncoding(encoding, &info);
+    }
+#endif // wxUSE_FONTMAP
+

     wxString pattern;
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),
                    spacing,
     wxString pattern;
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),
                    spacing,


@@ -79,12 +97,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;


@@ -111,6 +137,8 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 
     return TRUE;
 }
 
     return TRUE;
 }

+#endif
+  // wxUSE_NANOX

 
 // ----------------------------------------------------------------------------
 // wxFontEnumerator
 
 // ----------------------------------------------------------------------------
 // wxFontEnumerator


@@ -119,6 +147,9 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {
 bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
                                           bool fixedWidthOnly)
 {

+#if wxUSE_NANOX
+    return FALSE;
+#else

     int nFonts;
     char **fonts;
 
     int nFonts;
     char **fonts;
 


@@ -162,12 +193,16 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
     (void)ProcessFamiliesFromFontList(this, fonts, nFonts);
 
     XFreeFontNames(fonts);
     (void)ProcessFamiliesFromFontList(this, fonts, nFonts);
 
     XFreeFontNames(fonts);

-

     return TRUE;
     return TRUE;

+#endif
+    // wxUSE_NANOX

 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {

+#if wxUSE_NANOX
+    return FALSE;
+#else

     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
                    family.IsEmpty() ? wxT("*") : family.c_str());
     wxString pattern;
     pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
                    family.IsEmpty() ? wxT("*") : family.c_str());


@@ -232,4 +267,6 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     XFreeFontNames(fonts);
 
     return TRUE;
     XFreeFontNames(fonts);
 
     return TRUE;

+#endif
+    // wxUSE_NANOX

 }
 }