Use wxClientDataDictionary for client data.

[wxWidgets.git] / include / wx / fontenum.h

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 5b82956ddd9d825837a435163d188a2e90feaa31..587dad4a66f4a5761439a0ed2c041e589ce91c1f 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -13,7 +13,7 @@
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "fontenum.h"
 #endif
 
     #pragma interface "fontenum.h"
 #endif
 


@@ -27,6 +27,8 @@
 class WXDLLEXPORT wxFontEnumerator
 {
 public:
 class WXDLLEXPORT wxFontEnumerator
 {
 public:

+    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
     // 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


@@ -47,16 +49,41 @@ public:
     // TRUE to continue with it
 
     // called by EnumerateFacenames
     // TRUE to continue with it
 
     // called by EnumerateFacenames

-    virtual bool OnFacename(const wxString& WXUNUSED(facename))
-        { return FALSE; }
+    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(facename),
 
     // called by EnumerateEncodings
     virtual bool OnFontEncoding(const wxString& WXUNUSED(facename),

-                                const wxString& WXUNUSED(encoding))
-        { return FALSE; }
+                                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 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_
 };
 
 #endif // _WX_FONTENUM_H_