From 051a889da9b686cc7c24b33e1a02a53cf9dd8c0e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 27 Sep 2003 13:24:57 +0000 Subject: [PATCH] define wxFONTENCODING_UNICODE as UTF16/32 depending on the platform git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fontenc.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h index 60666c0abb..7e6874e0d6 100644 --- a/include/wx/fontenc.h +++ b/include/wx/fontenc.h @@ -76,8 +76,6 @@ enum wxFontEncoding wxFONTENCODING_UTF32BE, // UTF-32 Big Endian Unicode encoding wxFONTENCODING_UTF32LE, // UTF-32 Little Endian Unicode encoding - wxFONTENCODING_UNICODE, // Unicode (for wxEncodingConverter only) - wxFONTENCODING_MAX, // highest enumerated encoding value @@ -90,6 +88,13 @@ enum wxFontEncoding wxFONTENCODING_UTF32 = wxFONTENCODING_UTF32LE, // native UTF-32 #endif // WORDS_BIGENDIAN + // alias for the native Unicode encoding on this platform + // (this is used by wxEncodingConverter and wxUTFFile only for now) +#if SIZEOF_WCHAR_T == 2 + wxFONTENCODING_UNICODE = wxFONTENCODING_UTF16, +#else // SIZEOF_WCHAR_T == 4 + wxFONTENCODING_UNICODE = wxFONTENCODING_UTF32, +#endif // alternative names for Far Eastern encodings // Chinese -- 2.45.2