many warnings fixed (from HP-UX compilation log)

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

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 02f94a893065273b9fea8d83e573eba28c85561b..97352c7f772cf814f381624a401e83c22ddbfcab 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -22,17 +22,23 @@
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 
-class wxFontEnumerator
+class WXDLLEXPORT wxFontEnumerator
 {
 public:
-    // start enumerating font families - will result in OnFontFamily() being
-    // called for each available font family (unless it returns FALSE)
-    virtual bool EnumerateFamilies(bool fixedWidthOnly = FALSE);
+    // 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
+                 (
+                    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 = T(""));
+    virtual bool EnumerateEncodings(const wxString& family = wxT(""));
 
     // callbacks which are called after one of EnumerateXXX() functions from
     // above is invoked - all of them may return FALSE to stop enumeration or
@@ -46,6 +52,9 @@ public:
     virtual bool OnFontEncoding(const wxString& WXUNUSED(family),
                                 const wxString& WXUNUSED(encoding))
         { return FALSE; }
+
+    // virtual dtor for the base class
+    virtual ~wxFontEnumerator() { }
 };
 
 #endif // _WX_FONTENUM_H_