X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8cde57b8367b4e853fbe45d88ee23cea4a301e9..89c831801467203372b6964a785823f19e8063dd:/src/os2/fontenum.cpp?ds=inline diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp index b74beb0939..af3bd9ec78 100644 --- a/src/os2/fontenum.cpp +++ b/src/os2/fontenum.cpp @@ -20,12 +20,15 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_FONTMAP + #ifndef WX_PRECOMP #include "wx/font.h" #endif #include "wx/fontenum.h" #include "wx/fontmap.h" +#include "wx/encinfo.h" #include "wx/os2/private.h" @@ -59,7 +62,7 @@ private: // if not empty, enum only the fonts with this facename wxString m_facename; - // if TRUE, enum only fixed fonts + // if true, enum only fixed fonts bool m_fixedOnly; }; @@ -93,7 +96,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) wxNativeEncodingInfo info; if ( !wxGetNativeFontEncoding(encoding, &info) ) { - if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) + if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) ) { // no such encodings at all return FALSE; @@ -102,7 +105,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) m_charset = info.charset; m_facename = info.facename; - return TRUE; + return true; } #define wxFONTENUMPROC FONTENUMPROC @@ -146,7 +149,7 @@ bool wxFontEnumeratorHelper::OnFont(/*const LPLOGFONT lf, if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH ) { // not a fixed pitch font - return TRUE; + return true; } } @@ -155,13 +158,13 @@ bool wxFontEnumeratorHelper::OnFont(/*const LPLOGFONT lf, // check that we have the right encoding if ( lf->lfCharSet != m_charset ) { - return TRUE; + return true; } } return m_fontEnum->OnFacename(lf->lfFaceName); */ - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -180,14 +183,14 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding, } // else: no such fonts, unknown encoding - return TRUE; + return true; } -bool wxFontEnumerator::EnumerateEncodings(const wxString& family) +bool wxFontEnumerator::EnumerateEncodings(const wxString& WXUNUSED(family)) { wxFAIL_MSG(wxT("TODO")); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -212,3 +215,4 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm, } */ +#endif // wxUSE_FONTMAP