unicode fixes

[wxWidgets.git] / src / common / fontmap.cpp

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 18fc3917c2d9a5265c4d0482ad8be4cc25c397a5..dc352cb0540de8aa054848b87088b151ab9a51d7 100644 (file)
--- 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
+
+WX_BEGIN_ENUM( wxFontEncoding )
+       WX_ENUM_MEMBER( wxFONTENCODING_SYSTEM )
+       WX_ENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+       WX_ENUM_MEMBER( wxFONTENCODING_KOI8 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+       WX_ENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP437 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP850 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP852 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP855 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP866 )
+
+       WX_ENUM_MEMBER( wxFONTENCODING_CP874 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP932 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP936 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP949 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP950 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1250 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1251 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1252 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1253 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1254 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1255 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1256 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1257 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+       WX_ENUM_MEMBER( wxFONTENCODING_UTF7 )
+       WX_ENUM_MEMBER( wxFONTENCODING_UTF8 )
+       WX_ENUM_MEMBER( wxFONTENCODING_GB2312 )
+       WX_ENUM_MEMBER( wxFONTENCODING_BIG5 )
+       WX_ENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+       WX_ENUM_MEMBER( wxFONTENCODING_EUC_JP )
+       WX_ENUM_MEMBER( wxFONTENCODING_UNICODE )
+WX_END_ENUM( wxFontEncoding )
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------