mingw32 compilation fixes

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index fe6fe19421b34861e55cfa5ca11b39b7ed511b3a..7021de27dcf2937dd56c30346eb242c9ebf1f128 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -1,13 +1,25 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fontenum.cpp
+///////////////////////////////////////////////////////////////////////////////
+// Name:        msw/fontenum.cpp
 // Purpose:     wxFontEnumerator class for Windows
 // Author:      Julian Smart
-// Modified by:
+// Modified by: Vadim Zeitlin to add support for font encodings
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "fontenum.h"
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -20,44 +32,177 @@
   #include "wx/font.h"
 #endif
 
-#include <wx/msw/private.h>
+#include "wx/fontenum.h"
+#include "wx/fontmap.h"
 
-int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
-                           DWORD dwStyle, LONG lParam)
+#include "wx/msw/private.h"
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxFontEnumeratorHelper
 {
-    // Get rid of any fonts that we don't want...
-       if (dwStyle != TRUETYPE_FONTTYPE)
-               return 1;
+public:
+    wxFontEnumeratorHelper(wxFontEnumerator *fontEnum);
 
-       wxFontEnumerator *fontEnum = (wxFontEnumerator *)lParam;
+    // control what exactly are we enumerating
+    bool SetEncoding(wxFontEncoding encoding);
+    void SetFixedOnly(bool fixedOnly)
+        { m_fixedOnly = fixedOnly; }
 
-    wxFont font = wxCreateFontFromLogFont(lplf);
+    // call to start enumeration
+    void DoEnumerate();
 
-       if (fontEnum->OnFont(font))
-           return 1 ;
-    else
-        return 0 ;
-}
+    // called by our font enumeration proc
+    bool OnFont(const LPLOGFONT lf, const LPTEXTMETRIC tm) const;
+
+private:
+    // the object we forward calls to OnFont() to
+    wxFontEnumerator *m_fontEnum;
+
+    // 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 TRUE, enum only fixed fonts
+    bool m_fixedOnly;
+};
 
-IMPLEMENT_CLASS(wxFontEnumerator, wxObject)
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
 
-bool wxFontEnumerator::Enumerate()
+int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
+                                  DWORD dwStyle, LONG lParam);
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFontEnumeratorHelper
+// ----------------------------------------------------------------------------
+
+wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
-    m_faceNames.Clear();
+    m_fontEnum = fontEnum;
+    m_charset = -1;
+    m_fixedOnly = FALSE;
+}
 
-       HDC hDC = ::GetDC(NULL);
-#ifdef __WIN32__
-    ::EnumFontFamilies(hDC, (LPTSTR) NULL, (FONTENUMPROC) wxFontEnumeratorProc, (LPARAM) (void*) this) ;
+bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
+{
+    wxNativeEncodingInfo info;
+    if ( !wxGetNativeFontEncoding(encoding, &info) )
+    {
+        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        {
+            // no such encodings at all
+            return FALSE;
+        }
+    }
+    m_charset = info.charset;
+    m_facename = info.facename;
+
+    return TRUE;
+}
+
+#ifdef __GNUWIN32_OLD__
+    #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
 #else
-    ::EnumFonts(hDC, (LPTSTR) NULL, (FONTENUMPROC) wxFontEnumeratorProc, (LPARAM) (void*) this) ;
+    #define wxFONTENUMPROC FONTENUMPROC
 #endif
-       ::ReleaseDC(NULL, hDC);
-       return TRUE;
-}      
 
-bool wxFontEnumerator::OnFont(const wxFont& font)
+void wxFontEnumeratorHelper::DoEnumerate()
 {
-    m_faceNames.Add(font.GetFaceName());
+    HDC hDC = ::GetDC(NULL);
+
+#ifdef __WIN32__
+    LOGFONT lf;
+    lf.lfCharSet = m_charset;
+    wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
+    lf.lfPitchAndFamily = 0;
+    ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
+                         (LPARAM)this, 0 /* reserved */) ;
+#else // Win16
+    ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,
+                (LPARAM) (void*) this) ;
+#endif // Win32/16
+
+    ::ReleaseDC(NULL, hDC);
+}
+
+bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
+                                    const LPTEXTMETRIC tm) const
+{
+    if ( m_fixedOnly )
+    {
+        // check that it's a fixed pitch font (there is *no* error here, the
+        // flag name is misleading!)
+        if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
+        {
+            // not a fixed pitch font
+            return TRUE;
+        }
+    }
+
+    if ( m_charset != -1 )
+    {
+        // check that we have the right encoding
+        if ( lf->lfCharSet != m_charset )
+        {
+            return TRUE;
+        }
+    }
+
+    return m_fontEnum->OnFacename(lf->lfFaceName);
+}
+
+// ----------------------------------------------------------------------------
+// wxFontEnumerator
+// ----------------------------------------------------------------------------
+
+bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
+                                          bool fixedWidthOnly)
+{
+    wxFontEnumeratorHelper fe(this);
+    if ( fe.SetEncoding(encoding) )
+    {
+        fe.SetFixedOnly(fixedWidthOnly);
+
+        fe.DoEnumerate();
+    }
+    // else: no such fonts, unknown encoding
+
     return TRUE;
 }
 
+bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
+{
+    wxFAIL_MSG(wxT("TODO"));
+
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// Windows callbacks
+// ----------------------------------------------------------------------------
+
+int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
+                                  DWORD dwStyle, LONG lParam)
+{
+    // Get rid of any fonts that we don't want...
+    if ( dwStyle != TRUETYPE_FONTTYPE )
+    {
+        // continue enumeration
+        return TRUE;
+    }
+
+    wxFontEnumeratorHelper *fontEnum = (wxFontEnumeratorHelper *)lParam;
+
+    return fontEnum->OnFont(lplf, lptm);
+}
+