fix some warnings from GCC -Wextra

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

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 387081e73d4483e123a188d32a1e529ca706fb5d..ca127b3c8aa4d97ded4dc4a2d908a6ba5053ab6b 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
@@ -13,6 +13,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 +25,7 @@
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFontEnumerator
+class WXDLLIMPEXP_CORE wxFontEnumerator
 {
 public:
     wxFontEnumerator() {}
@@ -72,7 +76,14 @@ public:
     static bool IsValidFacename(const wxString &str);
 
 private:
+#ifdef wxHAS_UTF8_FONTS
+    // helper for ports that only use UTF-8 encoding natively
+    bool EnumerateEncodingsUTF8(const wxString& facename);
+#endif
+
     DECLARE_NO_COPY_CLASS(wxFontEnumerator)
 };
 
+#endif // wxUSE_FONTENUM
+
 #endif // _WX_FONTENUM_H_