X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36f210c81e5f8cdc65b80e57aad0c11bf2d08e63..1a6a6043f79b8b12958e6cb09d443213a969507d:/include/wx/fontenum.h

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 97352c7f77..9c56ec51cd 100644
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -2,8 +2,8 @@
 // Name:        fontenum.h
 // Purpose:     wxFontEnumerator class for getting available fonts
 // Author:      Julian Smart, Vadim Zeitlin
-// Modified by: extended to enumerate more than just font families and work ot
-//              only on Windows (VZ)
+// Modified by: extended to enumerate more than just font facenames and works
+//              not only on Windows now (VZ)
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart, Vadim Zeitlin
@@ -17,6 +17,8 @@
     #pragma interface "fontenum.h"
 #endif
 
+#include "wx/font.h"
+
 // ----------------------------------------------------------------------------
 // wxFontEnumerator enumerates all available fonts on the system or only the
 // fonts with given attributes
@@ -25,36 +27,63 @@
 class WXDLLEXPORT wxFontEnumerator
 {
 public:
-    // start enumerating font families (either all of them or those which
-    // support the given encoding) - will result in OnFontFamily() being
-    // called for each available font family (until they are exhausted or
-    // OnFontFamily returns FALSE)
-    virtual bool EnumerateFamilies
+    wxFontEnumerator() : m_Facenames(NULL), m_Encodings(NULL) { }
+
+    // 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)
+    virtual bool EnumerateFacenames
                  (
                     wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
                     bool fixedWidthOnly = FALSE
                  );
 
-    // enumerate the different encodings either for given font family or for
-    // all font families - will result in OnFontEncoding() being called for
-    // each available (family, encoding) couple
-    virtual bool EnumerateEncodings(const wxString& family = wxT(""));
+    // enumerate the different encodings either for given font facename or for
+    // all facenames - will result in OnFontEncoding() being called for each
+    // available (facename, encoding) couple
+    virtual bool EnumerateEncodings(const wxString& facename = wxT(""));
 
     // 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
 
-    // called by EnumerateFamilies
-    virtual bool OnFontFamily(const wxString& WXUNUSED(family))
-        { return FALSE; }
+    // called by EnumerateFacenames
+    virtual bool OnFacename(const wxString& facename)
+        { 
+            if (m_Facenames == NULL) m_Facenames = new wxArrayString;
+            m_Facenames -> Add(facename);
+            return TRUE;
+        }
 
     // called by EnumerateEncodings
-    virtual bool OnFontEncoding(const wxString& WXUNUSED(family),
-                                const wxString& WXUNUSED(encoding))
-        { return FALSE; }
+    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; }
+        
     // 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;
 };
 
 #endif // _WX_FONTENUM_H_