X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b6d97f9b8409a83be45fed39324101aeab27db8..7ecb8b06ade47981aa828a3f7fb4278f822456d3:/src/msw/fontenum.cpp diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp index 279f7be2ae..1f7305a937 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" @@ -41,15 +44,21 @@ // 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 + // we enumerate fonts with given enocding 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(); @@ -67,16 +76,27 @@ private: // 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, we enumerate the encodings, not fonts + bool m_enumEncodings; + + // the list of charsets we already found while enumerating charsets + wxArrayInt m_charsets; }; // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- +#ifndef __WXMICROWIN__ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm, DWORD dwStyle, LONG lParam); +#endif // ============================================================================ // implementation @@ -89,8 +109,15 @@ 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; +} + +void wxFontEnumeratorHelper::SetFamily(const wxString& family) +{ + m_enumEncodings = TRUE; + m_family = family; } bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) @@ -110,16 +137,19 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) return TRUE; } -#if defined(__GNUWIN32__) - //BJ : FIXME? I have the second implementation in 2.95. Does it work with other versions? - // #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) - #define wxFONTENUMPROC int(*)(const LOGFONTA *, const TEXTMETRICA *, long unsigned int, LPARAM) +#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() { +#ifndef __WXMICROWIN__ HDC hDC = ::GetDC(NULL); #ifdef __WIN32__ @@ -140,11 +170,31 @@ void wxFontEnumeratorHelper::DoEnumerate() #endif // Win32/16 ::ReleaseDC(NULL, hDC); +#endif } 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 @@ -189,7 +239,9 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, bool wxFontEnumerator::EnumerateEncodings(const wxString& family) { - wxFAIL_MSG(wxT("TODO")); + wxFontEnumeratorHelper fe(this); + fe.SetFamily(family); + fe.DoEnumerate(); return TRUE; } @@ -198,6 +250,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family) // Windows callbacks // ---------------------------------------------------------------------------- +#ifndef __WXMICROWIN__ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm, DWORD dwStyle, LONG lParam) { @@ -212,4 +265,6 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm, return fontEnum->OnFont(lplf, lptm); } +#endif +#endif // wxUSE_FONTMAP