projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minimal (nearly empty) wxDisplay for wxMGL (to compensate src/common/tplvcmn.cpp...
[wxWidgets.git]
/
include
/
wx
/
fontenum.h
diff --git
a/include/wx/fontenum.h
b/include/wx/fontenum.h
index 6da6a74784ea3b7e933fbac9cfa904c732071da8..6229a3db25608207e1acddf8f27511c3af05aa3c 100644
(file)
--- a/
include/wx/fontenum.h
+++ b/
include/wx/fontenum.h
@@
-13,10
+13,6
@@
#ifndef _WX_FONTENUM_H_
#define _WX_FONTENUM_H_
#ifndef _WX_FONTENUM_H_
#define _WX_FONTENUM_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "fontenum.h"
-#endif
-
#include "wx/fontenc.h"
#include "wx/arrstr.h"
#include "wx/fontenc.h"
#include "wx/arrstr.h"
@@
-33,11
+29,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
// 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
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
);
// enumerate the different encodings either for given font facename or for
@@
-46,43
+42,43
@@
public:
virtual bool EnumerateEncodings(const wxString& facename = wxEmptyString);
// callbacks which are called after one of EnumerateXXX() functions from
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)
// called by EnumerateFacenames
virtual bool OnFacename(const wxString& facename)
- {
+ {
if (m_Facenames == NULL) m_Facenames = new wxArrayString;
m_Facenames -> Add(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)
}
// 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);
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.
// 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.
{ return m_Facenames; }
// convenience function that returns array of encodings.
// Cannot be called before EnumerateEncodings.
- wxArrayString *GetEncodings()
+ wxArrayString *GetEncodings()
{ return m_Encodings; }
{ return m_Encodings; }
-
+
// virtual dtor for the base class
// virtual dtor for the base class
- virtual ~wxFontEnumerator()
- {
+ virtual ~wxFontEnumerator()
+ {
if (m_Facenames) delete m_Facenames;
if (m_Encodings) delete m_Encodings;
}
if (m_Facenames) delete m_Facenames;
if (m_Encodings) delete m_Encodings;
}
-
+
private:
wxArrayString *m_Facenames, *m_Encodings;
private:
wxArrayString *m_Facenames, *m_Encodings;