Added fontfactory.h that should have been part of 49213.

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

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 9a669505dd2da4e45e7e722e1475a1e0acdf9bda..29127061a8bcf78899e5c21cd9efac0143c494dd 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -13,14 +13,13 @@
 #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"
 

-#if wxUSE_PANGO || defined(__WXDFB__)
-    // defined if the port uses only UTF-8 font encodings internally
-    #define wxHAS_UTF8_FONTS
-#endif
-

 // ----------------------------------------------------------------------------
 // wxFontEnumerator enumerates all available fonts on the system or only the
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 // wxFontEnumerator enumerates all available fonts on the system or only the
 // fonts with given attributes


@@ -85,4 +84,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxFontEnumerator)
 };
 
     DECLARE_NO_COPY_CLASS(wxFontEnumerator)
 };
 

+#endif // wxUSE_FONTENUM
+

 #endif // _WX_FONTENUM_H_
 #endif // _WX_FONTENUM_H_