Set svn properties correctly for the newly added files.

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

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 9a669505dd2da4e45e7e722e1475a1e0acdf9bda..051ee572c1970a2e43ad90cd3e9549aa16288607 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -13,20 +13,19 @@
 #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
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFontEnumerator
+class WXDLLIMPEXP_CORE wxFontEnumerator

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


@@ -82,7 +81,9 @@ private:
     bool EnumerateEncodingsUTF8(const wxString& facename);
 #endif
 
     bool EnumerateEncodingsUTF8(const wxString& facename);
 #endif
 

-    DECLARE_NO_COPY_CLASS(wxFontEnumerator)
+    wxDECLARE_NO_COPY_CLASS(wxFontEnumerator);

 };
 
 };
 

+#endif // wxUSE_FONTENUM
+

 #endif // _WX_FONTENUM_H_
 #endif // _WX_FONTENUM_H_