added missing -univ package control files.

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 78ecb6043d4e56bfa55121720c141b76b48466c1..1f7305a937362fefff47bf6bf7450f8fd5d53391 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -28,11 +28,15 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_FONTMAP
+

 #ifndef WX_PRECOMP
   #include "wx/font.h"
 #endif
 
 #ifndef WX_PRECOMP
   #include "wx/font.h"
 #endif
 

+#include "wx/fontutil.h"

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

+#include "wx/fontmap.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -40,15 +44,21 @@
 // private classes
 // ----------------------------------------------------------------------------
 
 // private classes
 // ----------------------------------------------------------------------------
 

+// the helper class which calls ::EnumFontFamilies() and whose OnFont() is
+// called from the callback passed to this function and, in its turn, calls the
+// appropariate wxFontEnumerator method

 class wxFontEnumeratorHelper
 {
 public:
     wxFontEnumeratorHelper(wxFontEnumerator *fontEnum);
 
     // control what exactly are we enumerating
 class wxFontEnumeratorHelper
 {
 public:
     wxFontEnumeratorHelper(wxFontEnumerator *fontEnum);
 
     // control what exactly are we enumerating

+        // we enumerate fonts with given enocding

     bool SetEncoding(wxFontEncoding encoding);
     bool SetEncoding(wxFontEncoding encoding);

-    void SetFixedOnly(bool fixedOnly)
-        { m_fixedOnly = fixedOnly; }
+        // we enumerate fixed-width fonts
+    void SetFixedOnly(bool fixedOnly) { m_fixedOnly = fixedOnly; }
+        // we enumerate the encodings available in this family
+    void SetFamily(const wxString& family);

 
     // call to start enumeration
     void DoEnumerate();
 
     // call to start enumeration
     void DoEnumerate();


@@ -63,16 +73,30 @@ private:
     // if != -1, enum only fonts which have this encoding
     int m_charset;
 
     // if != -1, enum only fonts which have this encoding
     int m_charset;
 

+    // if not empty, enum only the fonts with this facename
+    wxString m_facename;
+
+    // if not empty, enum only the fonts in this family
+    wxString m_family;
+

     // if TRUE, enum only fixed fonts
     bool m_fixedOnly;
     // if TRUE, enum only fixed fonts
     bool m_fixedOnly;

+
+    // if TRUE, we enumerate the encodings, not fonts
+    bool m_enumEncodings;
+
+    // the list of charsets we already found while enumerating charsets
+    wxArrayInt m_charsets;

 };
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

+#ifndef __WXMICROWIN__

 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
                                   DWORD dwStyle, LONG lParam);
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
                                   DWORD dwStyle, LONG lParam);

+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -85,46 +109,92 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;
 wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;

-    m_charset = -1;
+    m_charset = DEFAULT_CHARSET;

     m_fixedOnly = FALSE;
     m_fixedOnly = FALSE;

+    m_enumEncodings = FALSE;
+}
+
+void wxFontEnumeratorHelper::SetFamily(const wxString& family)
+{
+    m_enumEncodings = TRUE;
+    m_family = family;

 }
 
 bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 {
 }
 
 bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 {

-    bool exact;
-    m_charset = wxCharsetFromEncoding(encoding, &exact);
-#ifdef __WIN32__
-    if ( !exact )
+    wxNativeEncodingInfo info;
+    if ( !wxGetNativeFontEncoding(encoding, &info) )

     {
     {

-        m_charset = DEFAULT_CHARSET;
+        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        {
+            // no such encodings at all
+            return FALSE;
+        }

     }
     }

-#endif // Win32
+    m_charset = info.charset;
+    m_facename = info.facename;

 
 

-    return exact;
+    return TRUE;

 }
 
 }
 

+#if defined(__GNUWIN32__) && !defined(__CYGWIN10__)
+    #if wxUSE_NORLANDER_HEADERS
+        #define wxFONTENUMPROC int(*)(const LOGFONT *, const TEXTMETRIC *, long unsigned int, LPARAM)
+    #else
+        #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
+    #endif
+#else
+    #define wxFONTENUMPROC FONTENUMPROC
+#endif
+

 void wxFontEnumeratorHelper::DoEnumerate()
 {
 void wxFontEnumeratorHelper::DoEnumerate()
 {

+#ifndef __WXMICROWIN__

     HDC hDC = ::GetDC(NULL);
 
 #ifdef __WIN32__
     LOGFONT lf;
     lf.lfCharSet = m_charset;
     HDC hDC = ::GetDC(NULL);
 
 #ifdef __WIN32__
     LOGFONT lf;
     lf.lfCharSet = m_charset;

-    lf.lfFaceName[0] = _T('\0');
+    wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));

     lf.lfPitchAndFamily = 0;
     lf.lfPitchAndFamily = 0;

-    ::EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)wxFontEnumeratorProc,
+    ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,

                          (LPARAM)this, 0 /* reserved */) ;
 #else // Win16
     ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,
                          (LPARAM)this, 0 /* reserved */) ;
 #else // Win16
     ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,

-                (LPARAM) (void*) this) ;
+    #ifdef STRICT
+               (LPARAM)
+    #else
+               (LPSTR)
+    #endif
+               this);

 #endif // Win32/16
 
     ::ReleaseDC(NULL, hDC);
 #endif // Win32/16
 
     ::ReleaseDC(NULL, hDC);

+#endif

 }
 
 bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
                                     const LPTEXTMETRIC tm) const
 {
 }
 
 bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
                                     const LPTEXTMETRIC tm) const
 {

+    if ( m_enumEncodings )
+    {
+        // is this a new charset?
+        int cs = lf->lfCharSet;
+        if ( m_charsets.Index(cs) == wxNOT_FOUND )
+        {
+            wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
+
+            wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
+            return m_fontEnum->OnFontEncoding(lf->lfFaceName,
+                                              wxFontMapper::GetEncodingName(enc));
+        }
+        else
+        {
+            // continue enumeration
+            return TRUE;
+        }
+    }
+

     if ( m_fixedOnly )
     {
         // check that it's a fixed pitch font (there is *no* error here, the
     if ( m_fixedOnly )
     {
         // check that it's a fixed pitch font (there is *no* error here, the


@@ -169,7 +239,9 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 {

-    wxFAIL_MSG(wxT("TODO"));
+    wxFontEnumeratorHelper fe(this);
+    fe.SetFamily(family);
+    fe.DoEnumerate();

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -178,6 +250,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 // Windows callbacks
 // ----------------------------------------------------------------------------
 
 // Windows callbacks
 // ----------------------------------------------------------------------------
 

+#ifndef __WXMICROWIN__

 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
                                   DWORD dwStyle, LONG lParam)
 {
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
                                   DWORD dwStyle, LONG lParam)
 {


@@ -192,4 +265,6 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 
     return fontEnum->OnFont(lplf, lptm);
 }
 
     return fontEnum->OnFont(lplf, lptm);
 }

+#endif

 
 

+#endif // wxUSE_FONTMAP