Don't infinitely recurse when setting the child focus. Without

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

diff --git a/include/wx/fontenum.h b/include/wx/fontenum.h
index 9c56ec51cd36349ef0a38e5707fa5981224472a7..6da6a74784ea3b7e933fbac9cfa904c732071da8 100644 (file)
--- a/include/wx/fontenum.h
+++ b/include/wx/fontenum.h
@@ -13,11 +13,12 @@
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "fontenum.h"
 #endif
 
     #pragma interface "fontenum.h"
 #endif
 

-#include "wx/font.h"
+#include "wx/fontenc.h"
+#include "wx/arrstr.h"

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


@@ -42,7 +43,7 @@ public:
     // enumerate the different encodings either for given font facename or for
     // all facenames - will result in OnFontEncoding() being called for each
     // available (facename, encoding) couple
     // enumerate the different encodings either for given font facename or for
     // all facenames - will result in OnFontEncoding() being called for each
     // available (facename, encoding) couple

-    virtual bool EnumerateEncodings(const wxString& facename = wxT(""));
+    virtual bool EnumerateEncodings(const wxString& facename = wxEmptyString);

 
     // callbacks which are called after one of EnumerateXXX() functions from
     // above is invoked - all of them may return FALSE to stop enumeration or
 
     // callbacks which are called after one of EnumerateXXX() functions from
     // above is invoked - all of them may return FALSE to stop enumeration or


@@ -84,6 +85,8 @@ public:
     
 private:
     wxArrayString *m_Facenames, *m_Encodings;
     
 private:
     wxArrayString *m_Facenames, *m_Encodings;

+
+    DECLARE_NO_COPY_CLASS(wxFontEnumerator)

 };
 
 #endif // _WX_FONTENUM_H_
 };
 
 #endif // _WX_FONTENUM_H_