X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3f6cbd99cd7c5b86742d56114b21da5b34a5c74..bc5443ba0701dd68eac6f987319ece2b7faba33d:/include/wx/chartype.h diff --git a/include/wx/chartype.h b/include/wx/chartype.h index 0395e000a5..e5ddbf0c9a 100644 --- a/include/wx/chartype.h +++ b/include/wx/chartype.h @@ -89,10 +89,6 @@ #ifdef HAVE_WIDEC_H #include #endif - - #if !defined(__GNUC__) || defined(__DARWIN__) - #define wxWINT_T_IS_TYPEDEF - #endif #endif /* wxUSE_WCHAR_T */ /* -------------------------------------------------------------------------- */ @@ -187,6 +183,37 @@ #endif /* __WCHAR_TYPE__ */ #endif /* ASCII/Unicode */ +/* ------------------------------------------------------------------------- */ +/* define wxStringCharType */ +/* ------------------------------------------------------------------------- */ + +/* depending on the platform, Unicode build can either store wxStrings as + wchar_t* or UTF-8 encoded char*: */ +#if wxUSE_UNICODE + #ifndef wxUSE_UNICODE_UTF8 + #define wxUSE_UNICODE_UTF8 0 + #endif + + #if wxUSE_UNICODE_UTF8 + #define wxUSE_UNICODE_WCHAR 0 + #else + #define wxUSE_UNICODE_WCHAR 1 + #endif +#else + #define wxUSE_UNICODE_WCHAR 0 + #define wxUSE_UNICODE_UTF8 0 +#endif + +/* define char type used by wxString internal representation: */ +#if wxUSE_UNICODE_UTF8 + typedef char wxStringCharType; +#elif wxUSE_UNICODE_WCHAR + typedef wchar_t wxStringCharType; +#else + typedef char wxStringCharType; +#endif + + /* ------------------------------------------------------------------------- */ /* define _T() and related macros */ /* ------------------------------------------------------------------------- */