removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called (the latter already calls SetAutoLayout(true) in case of a non-NULL window); usual cleanup: removing tabs and end of line whitespace, TRUE->true, FALSE->false, -1->wxID_ANY, Enable(false)->Disable(), ""->wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user