Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxFontEnumerator::GetFacenames/Encodings() now return arrays and not pointers to them (patch 1483341)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-28 13:51:34 +00:00
parent 22757a804b
commit 6540132fa1
15 changed files with 252 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
include/wx/fontenum.h
View File

@@ -24,7 +24,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,42 +49,25 @@ 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;
}
const wxString& WXUNUSED(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; }
// 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);
private:
wxArrayString *m_Facenames, *m_Encodings;
DECLARE_NO_COPY_CLASS(wxFontEnumerator)
};