mingw32 compilation fixes

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

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index d81c6742766e27e355c7fb30132fb0a15d74482a..a1d374896eee08ef33c08ab9ca2fa7124d2c5d7e 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -26,7 +26,9 @@
 #include "wx/string.h"
 #include "wx/utils.h"
 
 #include "wx/string.h"
 #include "wx/utils.h"
 

+#include "wx/fontmap.h"

 #include "wx/fontenum.h"
 #include "wx/fontenum.h"

+#include "wx/fontutil.h"

 
 #include <X11/Xlib.h>
 
 
 #include <X11/Xlib.h>
 


@@ -39,7 +41,7 @@ static char **CreateFontList(wxChar spacing, wxFontEncoding encoding,
                              int *nFonts);
 
 // extract all font families from the given font list and call our
                              int *nFonts);
 
 // extract all font families from the given font list and call our

-// OnFontFamily() for each of them
+// OnFacename() for each of them

 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts);
 static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
                                         char **fonts,
                                         int nFonts);


@@ -61,12 +63,20 @@ static char **CreateFontList(wxChar spacing,
                              wxFontEncoding encoding,
                              int *nFonts)
 {
                              wxFontEncoding encoding,
                              int *nFonts)
 {

-    wxString xencoding, xregistry;
-    wxGetXFontEncoding(encoding, &xencoding, &xregistry);
+    wxNativeEncodingInfo info;
+    wxGetNativeFontEncoding(encoding, &info);
+
+    if ( !wxTestFontEncoding(info) )
+    {
+        // ask font mapper for a replacement
+        (void)wxTheFontMapper->GetAltForEncoding(encoding, &info);
+    }

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

-                   spacing, xregistry.c_str(), xencoding.c_str());
+                   spacing,
+                   info.xregistry.c_str(),
+                   info.xencoding.c_str());

 
     // get the list of all fonts
     return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts);
 
     // get the list of all fonts
     return XListFonts((Display *)wxGetDisplay(), pattern.mb_str(), 32767, nFonts);


@@ -86,7 +96,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
             // it's not a full font name (probably an alias)
             continue;
         }
             // it's not a full font name (probably an alias)
             continue;
         }

-        
+

         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');
         char *dash = strchr(font + 1, '-');
         char *family = dash + 1;
         dash = strchr(family, '-');


@@ -95,7 +105,7 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 
         if ( families.Index(fam) == wxNOT_FOUND )
         {
 
         if ( families.Index(fam) == wxNOT_FOUND )
         {

-            if ( !This->OnFontFamily(fam) )
+            if ( !This->OnFacename(fam) )

             {
                 // stop enumerating
                 return FALSE;
             {
                 // stop enumerating
                 return FALSE;


@@ -113,8 +123,8 @@ static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
 
 // wxFontEnumerator
 // ----------------------------------------------------------------------------
 

-bool wxFontEnumerator::EnumerateFamilies(wxFontEncoding encoding,
-                                         bool fixedWidthOnly)
+bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
+                                          bool fixedWidthOnly)

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