X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..d3d0974f0f4ea623b5255db0b70b5e8374bf9d3f:/src/common/fontmap.cpp?ds=sidebyside

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index dc352cb054..ccf61230d9 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -56,57 +56,57 @@
 
 #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 )
+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
 
 // ----------------------------------------------------------------------------