X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..55826fcf4fd863d48ac28789d99bbb5c8a8d4c7e:/src/msw/fontenum.cpp

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 1747efcaaf..8ed53278ae 100644
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -28,10 +28,13 @@
   #pragma hdrstop
 #endif
 
+#if wxUSE_FONTMAP
+
 #ifndef WX_PRECOMP
   #include "wx/font.h"
 #endif
 
+#include "wx/fontutil.h"
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
 
@@ -84,14 +87,21 @@ private:
 
     // the list of charsets we already found while enumerating charsets
     wxArrayInt m_charsets;
+
+    // the list of facenames we already found while enumerating facenames
+    wxArrayString m_facenames;
+
+    DECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper)
 };
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
+#ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
                                   DWORD dwStyle, LONG lParam);
+#endif
 
 // ============================================================================
 // implementation
@@ -104,7 +114,7 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;
-    m_charset = -1;
+    m_charset = DEFAULT_CHARSET;
     m_fixedOnly = FALSE;
     m_enumEncodings = FALSE;
 }
@@ -117,33 +127,36 @@ void wxFontEnumeratorHelper::SetFamily(const wxString& family)
 
 bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 {
-    wxNativeEncodingInfo info;
-    if ( !wxGetNativeFontEncoding(encoding, &info) )
+    if ( encoding != wxFONTENCODING_SYSTEM )
     {
-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        wxNativeEncodingInfo info;
+        if ( !wxGetNativeFontEncoding(encoding, &info) )
         {
-            // no such encodings at all
-            return FALSE;
+#if wxUSE_FONTMAP
+            if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
+#endif // wxUSE_FONTMAP
+            {
+                // no such encodings at all
+                return FALSE;
+            }
         }
+
+        m_charset = info.charset;
+        m_facename = info.facename;
     }
-    m_charset = info.charset;
-    m_facename = info.facename;
 
     return TRUE;
 }
 
-#if defined(__GNUWIN32__)
-    #if wxUSE_NORLANDER_HEADERS
-        #define wxFONTENUMPROC int(*)(const LOGFONTA *, const TEXTMETRICA *, long unsigned int, LPARAM)
-    #else
-        #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
-    #endif
+#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS
+    #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
 #else
     #define wxFONTENUMPROC FONTENUMPROC
 #endif
 
 void wxFontEnumeratorHelper::DoEnumerate()
 {
+#ifndef __WXMICROWIN__
     HDC hDC = ::GetDC(NULL);
 
 #ifdef __WIN32__
@@ -164,6 +177,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
 #endif // Win32/16
 
     ::ReleaseDC(NULL, hDC);
+#endif
 }
 
 bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
@@ -178,7 +192,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
             wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
 
             wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
-            return m_fontEnum->OnFontEncoding(m_family,
+            return m_fontEnum->OnFontEncoding(lf->lfFaceName,
                                               wxFontMapper::GetEncodingName(enc));
         }
         else
@@ -199,7 +213,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         }
     }
 
-    if ( m_charset != -1 )
+    if ( m_charset != DEFAULT_CHARSET )
     {
         // check that we have the right encoding
         if ( lf->lfCharSet != m_charset )
@@ -207,6 +221,20 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
             return TRUE;
         }
     }
+    else // enumerating fonts in all charsets
+    {
+        // we can get the same facename twice or more in this case because it
+        // may exist in several charsets but we only want to return one copy of
+        // it (note that this can't happen for m_charset != DEFAULT_CHARSET)
+        if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
+        {
+            // continue enumeration
+            return TRUE;
+        }
+
+        wxConstCast(this, wxFontEnumeratorHelper)->
+            m_facenames.Add(lf->lfFaceName);
+    }
 
     return m_fontEnum->OnFacename(lf->lfFaceName);
 }
@@ -243,18 +271,26 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 // Windows callbacks
 // ----------------------------------------------------------------------------
 
+#ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
-                                  DWORD dwStyle, LONG lParam)
+                                  DWORD WXUNUSED(dwStyle), LONG lParam)
 {
+
+    // we used to process TrueType fonts only, but there doesn't seem to be any
+    // reasons to restrict ourselves to them here
+#if 0
     // Get rid of any fonts that we don't want...
     if ( dwStyle != TRUETYPE_FONTTYPE )
     {
         // continue enumeration
         return TRUE;
     }
+#endif // 0
 
     wxFontEnumeratorHelper *fontEnum = (wxFontEnumeratorHelper *)lParam;
 
     return fontEnum->OnFont(lplf, lptm);
 }
+#endif
 
+#endif // wxUSE_FONTMAP