X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/fontenum.h?ds=inline diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h index 6229a3db25..29127061a8 100644 --- a/include/wx/fontenum.h +++ b/include/wx/fontenum.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontenum.h +// Name: wx/fontenum.h // Purpose: wxFontEnumerator class for getting available fonts // Author: Julian Smart, Vadim Zeitlin // Modified by: extended to enumerate more than just font facenames and works @@ -13,6 +13,10 @@ #ifndef _WX_FONTENUM_H_ #define _WX_FONTENUM_H_ +#include "wx/defs.h" + +#if wxUSE_FONTENUM + #include "wx/fontenc.h" #include "wx/arrstr.h" @@ -24,7 +28,10 @@ class WXDLLEXPORT wxFontEnumerator { public: - wxFontEnumerator() : m_Facenames(NULL), m_Encodings(NULL) { } + wxFontEnumerator() {} + + // virtual dtor for the base class + virtual ~wxFontEnumerator() {} // start enumerating font facenames (either all of them or those which // support the given encoding) - will result in OnFacename() being @@ -46,43 +53,37 @@ public: // 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; - } + virtual bool OnFacename(const wxString& WXUNUSED(facename)) + { 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; - } - - // convenience function that returns array of facenames. Cannot be called - // before EnumerateFacenames. - wxArrayString *GetFacenames() - { return m_Facenames; } - - // convenience function that returns array of encodings. - // Cannot be called before EnumerateEncodings. - wxArrayString *GetEncodings() - { return m_Encodings; } + const wxString& WXUNUSED(encoding)) + { return true; } - // virtual dtor for the base class - virtual ~wxFontEnumerator() - { - if (m_Facenames) delete m_Facenames; - if (m_Encodings) delete m_Encodings; - } + + + // convenience function that returns array of facenames. + static wxArrayString + GetFacenames(wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all + bool fixedWidthOnly = false); + + // convenience function that returns array of all available encodings. + static wxArrayString GetEncodings(const wxString& facename = wxEmptyString); + + // convenience function that returns true if the given face name exist + // in the user's system + static bool IsValidFacename(const wxString &str); private: - wxArrayString *m_Facenames, *m_Encodings; +#ifdef wxHAS_UTF8_FONTS + // helper for ports that only use UTF-8 encoding natively + bool EnumerateEncodingsUTF8(const wxString& facename); +#endif DECLARE_NO_COPY_CLASS(wxFontEnumerator) }; +#endif // wxUSE_FONTENUM + #endif // _WX_FONTENUM_H_