X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0841bffa45db4cafb899d06fa1ff22ed1a8daa89..220af862c14ef432584fae3ef096aa17a6cfaf2d:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 92556cea5d..a31a3825e4 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -44,6 +44,8 @@ // Windows (VC++) has broad TCHAR support #if defined(__VISUALC__) && defined(__WIN32__) +#define HAVE_WCSLEN 1 + #include #if wxUSE_UNICODE // temporary - preserve binary compatibility typedef _TCHAR wxChar; @@ -54,6 +56,9 @@ typedef _TUCHAR wxUChar; #define wxSChar signed char #define wxUChar unsigned char #endif + // wchar_t is available +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 1 // ctype.h functions #define wxIsalnum _istalnum @@ -161,33 +166,11 @@ typedef _TUCHAR wxUChar; #define wxSChar signed char #define wxUChar unsigned char #endif + // wchar_t is available +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 1 -#include -#include -#include -#include - - // ctype.h functions -inline WORD __wxMSW_ctype(wxChar ch) -{ - WORD ret; - GetStringTypeEx(LOCALE_USER_DEFAULT, CT_CTYPE1, &ch, 1, &ret); - return ret; -} -#define wxIsalnum(x) IsCharAlphaNumeric -#define wxIsalpha IsCharAlpha -#define wxIsctrl(x) (__wxMSW_ctype(x) & C1_CNTRL) -#define wxIsdigit(x) (__wxMSW_ctype(x) & C1_DIGIT) -#define wxIsgraph(x) (__wxMSW_ctype(x) & (C1_DIGIT|C1_PUNCT|C1_ALPHA)) -#define wxIslower(x) IsCharLower -#define wxIsprint(x) (__wxMSW_ctype(x) & (C1_DIGIT|C1_SPACE|C1_PUNCT|C1_ALPHA)) -#define wxIspunct(x) (__wxMSW_ctype(x) & C1_PUNCT) -#define wxIsspace(x) (__wxMSW_ctype(x) & C1_SPACE) -#define wxIsupper(x) IsCharUpper -#define wxIsxdigit(x) (__wxMSW_ctype(x) & C1_XDIGIT) -#define wxTolower(x) (wxChar)CharLower((LPTSTR)(x)) -#define wxToupper(x) (wxChar)CharUpper((LPTSTR)(x)) - +#define wxNEED_WX_CTYPE_H // #define wxStrtok strtok_r // Borland C++ 4.52 doesn't have strtok_r #define wxNEED_WX_STRING_H #define wxNEED_WX_STDIO_H @@ -195,12 +178,45 @@ inline WORD __wxMSW_ctype(wxChar ch) #define wxNEED_WX_TIME_H #define wxNEED_WCSLEN -#else//!Windows +#else//!TCHAR-aware compilers + +// check whether we should include wchar.h or equivalent +#if wxUSE_UNICODE + #undef wxUSE_WCHAR_T + #define wxUSE_WCHAR_T 1 // wchar_t *must* be available in Unicode mode +#elif !defined(wxUSE_WCHAR_T) + #if defined(__VISUALC__) && (__VISUALC__ < 900) + #define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5 + #elif defined(__UNIX__) + #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) + #define wxUSE_WCHAR_T 1 + #else + #define wxUSE_WCHAR_T 0 + #endif + #elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h + #define wxUSE_WCHAR_T 0 + #else + // add additional compiler checks if this fails + #define wxUSE_WCHAR_T 1 + #endif +#endif//wxUSE_UNICODE + +#if wxUSE_WCHAR_T + #ifdef HAVE_WCSTR_H + #include + #else + #ifndef __FreeBSD__ + #include + #else + #include + #define wxNEED_WCSLEN + #endif + #endif +#endif // check whether we are doing Unicode #if wxUSE_UNICODE -#include #include // this is probably glibc-specific @@ -279,6 +295,9 @@ typedef unsigned char wxUChar; #define wxUChar unsigned char #endif +#ifdef __FreeBSD__ + #undef _T +#endif #define _T(x) x // ctype.h functions @@ -417,6 +436,7 @@ inline size_t WXDLLEXPORT wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } #endif +#if wxUSE_WCHAR_T // multibyte<->widechar conversion size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n); size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *psz, size_t n); @@ -431,6 +451,17 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *psz, size_t n); #define wxWC2WX wxWC2MB #define wxWX2WC wxMB2WC #endif +#else +// No wxUSE_WCHAR_T: we have to do something (JACS) +#define wxMB2WC wxStrncpy +#define wxWC2MB wxStrncpy +#define wxMB2WX wxStrncpy +#define wxWX2MB wxStrncpy +#define wxWC2WX wxWC2MB +#define wxWX2WC wxMB2WC +#endif + +bool WXDLLEXPORT wxOKlibc(); // for internal use // if libc versions are not available, use replacements defined in wxchar.cpp #ifndef wxStrdup @@ -453,8 +484,41 @@ wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale); size_t WXDLLEXPORT wcslen(const wchar_t *s); #endif +#ifdef wxNEED_WX_CTYPE_H +int WXDLLEXPORT wxIsalnum(wxChar ch); +int WXDLLEXPORT wxIsalpha(wxChar ch); +int WXDLLEXPORT wxIsctrl(wxChar ch); +int WXDLLEXPORT wxIsdigit(wxChar ch); +int WXDLLEXPORT wxIsgraph(wxChar ch); +int WXDLLEXPORT wxIslower(wxChar ch); +int WXDLLEXPORT wxIsprint(wxChar ch); +int WXDLLEXPORT wxIspunct(wxChar ch); +int WXDLLEXPORT wxIsspace(wxChar ch); +int WXDLLEXPORT wxIsupper(wxChar ch); +int WXDLLEXPORT wxIsxdigit(wxChar ch); +int WXDLLEXPORT wxTolower(wxChar ch); +int WXDLLEXPORT wxToupper(wxChar ch); +#endif + #ifdef wxNEED_WX_STRING_H +wxChar * WXDLLEXPORT wxStrcat(wxChar *dest, const wxChar *src); +wxChar * WXDLLEXPORT wxStrchr(const wxChar *s, wxChar c); +int WXDLLEXPORT wxStrcmp(const wxChar *s1, const wxChar *s2); +int WXDLLEXPORT wxStrcoll(const wxChar *s1, const wxChar *s2); +wxChar * WXDLLEXPORT wxStrcpy(wxChar *dest, const wxChar *src); +size_t WXDLLEXPORT wxStrcspn(const wxChar *s, const wxChar *reject); size_t WXDLLEXPORT wxStrlen(const wxChar *s); +wxChar * WXDLLEXPORT wxStrncat(wxChar *dest, const wxChar *src, size_t n); +int WXDLLEXPORT wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n); +wxChar * WXDLLEXPORT wxStrncpy(wxChar *dest, const wxChar *src, size_t n); +wxChar * WXDLLEXPORT wxStrpbrk(const wxChar *s, const wxChar *accept); +wxChar * WXDLLEXPORT wxStrrchr(const wxChar *s, wxChar c); +size_t WXDLLEXPORT wxStrspn(const wxChar *s, const wxChar *accept); +wxChar * WXDLLEXPORT wxStrstr(const wxChar *haystack, const wxChar *needle); +double WXDLLEXPORT wxStrtod(const wxChar *nptr, wxChar **endptr); +long int WXDLLEXPORT wxStrtol(const wxChar *nptr, wxChar **endptr, int base); +unsigned long int WXDLLEXPORT wxStrtoul(const wxChar *nptr, wxChar **endptr, int base); +size_t WXDLLEXPORT wxStrxfrm(wxChar *dest, const wxChar *src, size_t n); #endif #ifdef wxNEED_WX_STDIO_H