Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 8544e0dc493662504487926c030d2bf57765bcf1..051ee572c1970a2e43ad90cd3e9549aa16288607 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -13,6 +13,10 @@
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 

+#include "wx/defs.h"
+
+#if wxUSE_FONTENUM
+

 #include "wx/fontenc.h"
 #include "wx/arrstr.h"
 
 #include "wx/fontenc.h"
 #include "wx/arrstr.h"
 


@@ -21,7 +25,7 @@
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFontEnumerator
+class WXDLLIMPEXP_CORE wxFontEnumerator

 {
 public:
     wxFontEnumerator() {}
 {
 public:
     wxFontEnumerator() {}


@@ -72,7 +76,14 @@ public:
     static bool IsValidFacename(const wxString &str);
 
 private:
     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_
 #endif // _WX_FONTENUM_H_