X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/142b3bc26a6e93f5857bc053c7748b2c845c4a8e..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/os2/fontenum.cpp diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp index 26a1043932..af3bd9ec78 100644 --- a/src/os2/fontenum.cpp +++ b/src/os2/fontenum.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontenum.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -32,6 +28,7 @@ #include "wx/fontenum.h" #include "wx/fontmap.h" +#include "wx/encinfo.h" #include "wx/os2/private.h" @@ -65,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; }; @@ -108,7 +105,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) m_charset = info.charset; m_facename = info.facename; - return TRUE; + return true; } #define wxFONTENUMPROC FONTENUMPROC @@ -152,7 +149,7 @@ bool wxFontEnumeratorHelper::OnFont(/*const LPLOGFONT lf, if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH ) { // not a fixed pitch font - return TRUE; + return true; } } @@ -161,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; } // ---------------------------------------------------------------------------- @@ -186,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; } // ----------------------------------------------------------------------------