X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/fontenum.h diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h index 797da7438c..01af35089f 100644 --- a/include/wx/fontenum.h +++ b/include/wx/fontenum.h @@ -7,7 +7,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Vadim Zeitlin -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FONTENUM_H_ @@ -33,11 +33,11 @@ public: // start enumerating font facenames (either all of them or those which // support the given encoding) - will result in OnFacename() being // called for each available facename (until they are exhausted or - // OnFacename returns FALSE) + // OnFacename returns false) virtual bool EnumerateFacenames ( wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all - bool fixedWidthOnly = FALSE + bool fixedWidthOnly = false ); // enumerate the different encodings either for given font facename or for @@ -46,43 +46,43 @@ public: virtual bool EnumerateEncodings(const wxString& facename = wxEmptyString); // callbacks which are called after one of EnumerateXXX() functions from - // above is invoked - all of them may return FALSE to stop enumeration or - // TRUE to continue with it + // above is invoked - all of them may return false to stop enumeration or + // true to continue with it // called by EnumerateFacenames virtual bool OnFacename(const wxString& facename) - { + { if (m_Facenames == NULL) m_Facenames = new wxArrayString; m_Facenames -> Add(facename); - return TRUE; + return true; } // called by EnumerateEncodings virtual bool OnFontEncoding(const wxString& WXUNUSED(facename), const wxString& encoding) - { + { if (m_Encodings == NULL) m_Encodings = new wxArrayString; m_Encodings -> Add(encoding); - return TRUE; + return true; } - + // convenience function that returns array of facenames. Cannot be called // before EnumerateFacenames. - wxArrayString *GetFacenames() + wxArrayString *GetFacenames() { return m_Facenames; } // convenience function that returns array of encodings. // Cannot be called before EnumerateEncodings. - wxArrayString *GetEncodings() + wxArrayString *GetEncodings() { return m_Encodings; } - + // virtual dtor for the base class - virtual ~wxFontEnumerator() - { + virtual ~wxFontEnumerator() + { if (m_Facenames) delete m_Facenames; if (m_Encodings) delete m_Encodings; } - + private: wxArrayString *m_Facenames, *m_Encodings;