X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dc55027531c688d9eebb88485b4789a143aa2cb..fef5c55604e20e2a90843a2278b1f5c8c817dcee:/src/common/fontmap.cpp?ds=sidebyside

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index ed0b001b0d..ccf61230d9 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontmap.h"
 #endif
 
@@ -54,6 +54,61 @@
 
 #include "wx/encconv.h"
 
+#if wxUSE_EXTENDED_RTTI
+
+wxBEGIN_ENUM( wxFontEncoding )
+	wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
+	wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+	wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+	wxENUM_MEMBER( wxFONTENCODING_KOI8 )
+	wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+	wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+	wxENUM_MEMBER( wxFONTENCODING_CP437 )
+	wxENUM_MEMBER( wxFONTENCODING_CP850 )
+	wxENUM_MEMBER( wxFONTENCODING_CP852 )
+	wxENUM_MEMBER( wxFONTENCODING_CP855 )
+	wxENUM_MEMBER( wxFONTENCODING_CP866 )
+
+	wxENUM_MEMBER( wxFONTENCODING_CP874 )
+	wxENUM_MEMBER( wxFONTENCODING_CP932 )
+	wxENUM_MEMBER( wxFONTENCODING_CP936 )
+	wxENUM_MEMBER( wxFONTENCODING_CP949 )
+	wxENUM_MEMBER( wxFONTENCODING_CP950 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1250 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1251 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1252 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1253 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1254 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1255 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1256 )
+	wxENUM_MEMBER( wxFONTENCODING_CP1257 )
+	wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+	wxENUM_MEMBER( wxFONTENCODING_UTF7 )
+	wxENUM_MEMBER( wxFONTENCODING_UTF8 )
+	wxENUM_MEMBER( wxFONTENCODING_GB2312 )
+	wxENUM_MEMBER( wxFONTENCODING_BIG5 )
+	wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+	wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
+	wxENUM_MEMBER( wxFONTENCODING_UNICODE )
+wxEND_ENUM( wxFontEncoding )
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -85,6 +140,8 @@ public:
 private:
     bool m_flagOld;
     bool& m_flag;
+
+    DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
 };
 
 // ============================================================================