X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/434d2cb3c67c7afc1637e867e47010d13ee8903f..6db90681cf0b58209a061561f5d3624f6eda8024:/include/wx/wxchar.h?ds=sidebyside diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 6b44b31fad..42eb1a76be 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; @@ -168,32 +170,7 @@ typedef _TUCHAR wxUChar; #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 @@ -205,22 +182,36 @@ inline WORD __wxMSW_ctype(wxChar ch) // 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 + #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 -#else -#define wxUSE_WCHAR_T 1 -#endif -#endif + #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 -#include -#endif + #ifdef HAVE_WCSTR_H + #include + #else + #ifndef __FreeBSD__ + #include + #else + #include + #define wxNEED_WCSLEN + #endif + #endif #endif // check whether we are doing Unicode @@ -304,6 +295,9 @@ typedef unsigned char wxUChar; #define wxUChar unsigned char #endif +#ifdef __FreeBSD__ + #undef _T +#endif #define _T(x) x // ctype.h functions @@ -434,18 +428,18 @@ typedef unsigned char wxUChar; #endif /// checks whether the passed in pointer is NULL and if the string is empty -inline bool WXDLLEXPORT wxIsEmpty(const wxChar *p) { return !p || !*p; } +WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } #ifndef wxNEED_WX_STRING_H /// safe version of strlen() (returns 0 if passed NULL pointer) -inline size_t WXDLLEXPORT wxStrlen(const wxChar *psz) +WXDLLEXPORT inline size_t 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); +WXDLLEXPORT size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n); +WXDLLEXPORT size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n); #if wxUSE_UNICODE #define wxMB2WX wxMB2WC #define wxWX2MB wxWC2MB @@ -457,73 +451,98 @@ 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 + +WXDLLEXPORT bool wxOKlibc(); // for internal use // if libc versions are not available, use replacements defined in wxchar.cpp #ifndef wxStrdup -wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz); +WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz); #endif #ifndef wxStricmp -int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2); +WXDLLEXPORT int wxStricmp(const wxChar *psz1, const wxChar *psz2); #endif #ifndef wxStrtok -wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr); +WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr); #endif #ifndef wxSetlocale -wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale); +WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale); #endif #ifdef wxNEED_WCSLEN // for use in buffer.h -size_t WXDLLEXPORT wcslen(const wchar_t *s); +WXDLLEXPORT size_t wcslen(const wchar_t *s); +#endif + +#ifdef wxNEED_WX_CTYPE_H +WXDLLEXPORT int wxIsalnum(wxChar ch); +WXDLLEXPORT int wxIsalpha(wxChar ch); +WXDLLEXPORT int wxIsctrl(wxChar ch); +WXDLLEXPORT int wxIsdigit(wxChar ch); +WXDLLEXPORT int wxIsgraph(wxChar ch); +WXDLLEXPORT int wxIslower(wxChar ch); +WXDLLEXPORT int wxIsprint(wxChar ch); +WXDLLEXPORT int wxIspunct(wxChar ch); +WXDLLEXPORT int wxIsspace(wxChar ch); +WXDLLEXPORT int wxIsupper(wxChar ch); +WXDLLEXPORT int wxIsxdigit(wxChar ch); +WXDLLEXPORT int wxTolower(wxChar ch); +WXDLLEXPORT int 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); +WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src); +WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c); +WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2); +WXDLLEXPORT int wxStrcoll(const wxChar *s1, const wxChar *s2); +WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src); +WXDLLEXPORT size_t wxStrcspn(const wxChar *s, const wxChar *reject); +WXDLLEXPORT size_t wxStrlen(const wxChar *s); +WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n); +WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n); +WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n); +WXDLLEXPORT wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept); +WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c); +WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept); +WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle); +WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr); +WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base); +WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base); +WXDLLEXPORT size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n); #endif #ifdef wxNEED_WX_STDIO_H #include #include -int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...); -int WXDLLEXPORT wxVprintf(const wxChar *fmt, va_list argptr); -int WXDLLEXPORT wxFprintf(FILE *stream, const wxChar *fmt, ...); -int WXDLLEXPORT wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr); -int WXDLLEXPORT wxSprintf(wxChar *buf, const wxChar *fmt, ...); -int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr); -int WXDLLEXPORT wxSscanf(const wxChar *buf, const wxChar *fmt, ...); -int WXDLLEXPORT wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr); +WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...); +WXDLLEXPORT int wxVprintf(const wxChar *fmt, va_list argptr); +WXDLLEXPORT int wxFprintf(FILE *stream, const wxChar *fmt, ...); +WXDLLEXPORT int wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr); +WXDLLEXPORT int wxSprintf(wxChar *buf, const wxChar *fmt, ...); +WXDLLEXPORT int wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr); +WXDLLEXPORT int wxSscanf(const wxChar *buf, const wxChar *fmt, ...); +WXDLLEXPORT int wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr); #endif #ifndef wxAtof -double WXDLLEXPORT wxAtof(const wxChar *psz); +WXDLLEXPORT double wxAtof(const wxChar *psz); #endif #ifdef wxNEED_WX_STDLIB_H -int WXDLLEXPORT wxAtoi(const wxChar *psz); -long WXDLLEXPORT wxAtol(const wxChar *psz); -wxChar * WXDLLEXPORT wxGetenv(const wxChar *name); -int WXDLLEXPORT wxSystem(const wxChar *psz); +WXDLLEXPORT int wxAtoi(const wxChar *psz); +WXDLLEXPORT long wxAtol(const wxChar *psz); +WXDLLEXPORT wxChar * wxGetenv(const wxChar *name); +WXDLLEXPORT int wxSystem(const wxChar *psz); #endif #endif