X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ad178a657eee61dc43a516b8aaf4ae2499302a24:/src/os2/fontenum.cpp?ds=sidebyside diff --git a/src/os2/fontenum.cpp b/src/os2/fontenum.cpp index 166657ceff..fdb1f4af11 100644 --- a/src/os2/fontenum.cpp +++ b/src/os2/fontenum.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/fontenum.cpp +// Name: src/os2/fontenum.cpp // Purpose: wxFontEnumerator class for Windows // Author: Julian Smart // Modified by: David Webster to add support for font encodings // Created: 01/03/00 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,20 +17,17 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontenum.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #if wxUSE_FONTMAP +#include "wx/fontenum.h" + #ifndef WX_PRECOMP - #include "wx/font.h" + #include "wx/font.h" #endif -#include "wx/fontenum.h" #include "wx/fontmap.h" #include "wx/encinfo.h" @@ -66,7 +63,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; }; @@ -109,7 +106,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) m_charset = info.charset; m_facename = info.facename; - return TRUE; + return true; } #define wxFONTENUMPROC FONTENUMPROC @@ -123,7 +120,7 @@ void wxFontEnumeratorHelper::DoEnumerate() #ifdef __WIN32__ LOGFONT lf; lf.lfCharSet = m_charset; - wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName)); + wxStrlcpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName)); lf.lfPitchAndFamily = 0; ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc, (LPARAM)this, 0) ; @@ -153,7 +150,7 @@ bool wxFontEnumeratorHelper::OnFont(/*const LPLOGFONT lf, if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH ) { // not a fixed pitch font - return TRUE; + return true; } } @@ -162,13 +159,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; } // ---------------------------------------------------------------------------- @@ -187,14 +184,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; } // ----------------------------------------------------------------------------