X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85ab460e7d62b52b105b3dc0bbdd36cebc14fb4b..e90d566109362e04b65394a0c053f33f156bdaaf:/include/wx/fontenum.h

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 387081e73d..782dc7fd9e 100644
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontenum.h
+// Name:        wx/fontenum.h
 // Purpose:     wxFontEnumerator class for getting available fonts
 // Author:      Julian Smart, Vadim Zeitlin
 // 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
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +12,10 @@
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_FONTENUM
+
 #include "wx/fontenc.h"
 #include "wx/arrstr.h"
 
@@ -21,7 +24,7 @@
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontEnumerator
+class WXDLLIMPEXP_CORE wxFontEnumerator
 {
 public:
     wxFontEnumerator() {}
@@ -72,7 +75,14 @@ public:
     static bool IsValidFacename(const wxString &str);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxFontEnumerator)
+#ifdef wxHAS_UTF8_FONTS
+    // helper for ports that only use UTF-8 encoding natively
+    bool EnumerateEncodingsUTF8(const wxString& facename);
+#endif
+
+    wxDECLARE_NO_COPY_CLASS(wxFontEnumerator);
 };
 
+#endif // wxUSE_FONTENUM
+
 #endif // _WX_FONTENUM_H_