Added missing wx/defs.h includes in propgrid headers

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

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 58218c892db4a988b8ccf9c58d7f686dd2882a52..051ee572c1970a2e43ad90cd3e9549aa16288607 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
 // 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_
 
 #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() {}


@@ -67,8 +71,19 @@ public:
     // convenience function that returns array of all available encodings.
     static wxArrayString GetEncodings(const wxString& facename = wxEmptyString);
 
     // convenience function that returns array of all available encodings.
     static wxArrayString GetEncodings(const wxString& facename = wxEmptyString);
 

+    // convenience function that returns true if the given face name exist
+    // in the user's system
+    static bool IsValidFacename(const wxString &str);
+

 private:
 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_