X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66f32eca4c2b10c671c2c77769f90b23ff177c10..794005c0acc80bf21ca0ed2e1f42f1d78947957b:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index e1342aecc7..42eb1a76be 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -21,9 +21,31 @@ #error "MBCS is not supported by wxChar" #endif +// set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined +#if defined(_UNICODE) || defined(UNICODE) +#undef wxUSE_UNICODE +#define wxUSE_UNICODE 1 +#else +#ifndef wxUSE_UNICODE +#define wxUSE_UNICODE 0 +#endif +#endif + +// and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1... +#if wxUSE_UNICODE +#ifndef _UNICODE +#define _UNICODE +#endif +#ifndef UNICODE +#define UNICODE +#endif +#endif + // 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; @@ -34,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 @@ -61,6 +86,8 @@ typedef _TUCHAR wxUChar; #define wxStrcpy _tcscpy #define wxStrcspn _tcscspn #define wxStrftime _tcsftime +#define wxStricmp _tcsicmp +#define wxStrlen_ _tcslen // used in wxStrlen inline function #define wxStrncat _tcsncat #define wxStrncmp _tcsncmp #define wxStrncpy _tcsncpy @@ -101,10 +128,13 @@ typedef _TUCHAR wxUChar; #define wxUngetc _tungetc #define wxVfprint _vftprintf #define wxVprintf _vtprintf +#define wxVsscanf _vstscanf #define wxVsprintf _vstprintf // stdlib.h functions -#define wxAtof(s) atof(wxString(s).mb_str()) +#if !wxUSE_UNICODE +#define wxAtof atof +#endif #define wxAtoi _ttoi #define wxAtol _ttol #define wxGetenv _tgetenv @@ -120,12 +150,73 @@ typedef _TUCHAR wxUChar; // translate wxZZZ names -#else//!Windows (VC++) +#elif defined(__BORLANDC__) && defined(__WIN32__) + +// Borland C++ 4.52 doesn't have much tchar support +// maybe Borland C++ 5.02 has, can't check right now +// but I'll use the Win32 API instead here + +#include +#if wxUSE_UNICODE // temporary - preserve binary compatibility +typedef _TCHAR wxChar; +typedef _TSCHAR wxSChar; +typedef _TUCHAR wxUChar; +#else +#define wxChar char +#define wxSChar signed char +#define wxUChar unsigned char +#endif + // wchar_t is available +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 1 + +#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 +#define wxNEED_WX_STDLIB_H +#define wxNEED_WX_TIME_H +#define wxNEED_WCSLEN + +#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 @@ -149,8 +240,16 @@ typedef unsigned __WCHAR_TYPE__ wxUChar; #define wxIsspace iswspace #define wxIsupper iswupper #define wxIsxdigit iswxdigit -#define wxTolower towlower -#define wxToupper towupper + +#if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0) + // /usr/include/wctype.h incorrectly declares translations tables which + // provokes tons of compile-time warnings - try to correct this + #define wxTolower(wc) towctrans((wc), (wctrans_t)__ctype_tolower) + #define wxToupper(wc) towctrans((wc), (wctrans_t)__ctype_toupper) +#else + #define wxTolower towlower + #define wxToupper towupper +#endif // gcc/!gcc // string.h functions (wchar.h) #define wxStrcat wcscat @@ -159,6 +258,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar; #define wxStrcoll wcscoll #define wxStrcpy wcscpy #define wxStrcspn wcscspn +#define wxStrlen_ wcslen // used in wxStrlen inline function #define wxStrncat wcsncat #define wxStrncmp wcsncmp #define wxStrncpy wcsncpy @@ -177,7 +277,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar; #define wxNEED_WX_STDLIB_H #define wxNEED_WX_TIME_H -#else +#else//!glibc #error "Please define your compiler's Unicode conventions in wxChar.h" #endif #else//!Unicode @@ -195,6 +295,9 @@ typedef unsigned char wxUChar; #define wxUChar unsigned char #endif +#ifdef __FreeBSD__ + #undef _T +#endif #define _T(x) x // ctype.h functions @@ -216,6 +319,38 @@ typedef unsigned char wxUChar; #define wxSetlocale setlocale // string.h functions +#define wxStricmp strcasecmp +// #define wxStrtok strtok_r // this needs a configure check + + // leave the rest to defaults below +#define wxNEED_WX_STRING_H +#define wxNEED_WX_STDIO_H +#define wxNEED_WX_STDLIB_H +#define wxNEED_WX_TIME_H + +#endif//Unicode +#endif//TCHAR-aware compilers + +// define wxStricmp for various compilers without Unicode possibilities +#if !defined(wxStricmp) && !wxUSE_UNICODE +#if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) + #define wxStricmp stricmp +#elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS) && defined(__INTEL__)) + #define wxStricmp _stricmp +#elif defined(__UNIX__) || defined(__GNUWIN32__) + #define wxStricmp strcasecmp +#elif defined(__MWERKS__) && !defined(__INTEL__) + // use wxWindows' implementation +#else + // if you leave wxStricmp undefined, wxWindows' implementation will be used + #error "Please define string case-insensitive compare for your OS/compiler" +#endif +#endif + +// if we need to define for standard headers, and we're not using Unicode, +// just define to standard C library routines +#if !wxUSE_UNICODE +#ifdef wxNEED_WX_STRING_H #define wxStrcat strcat #define wxStrchr strchr #define wxStrcmp strcmp @@ -223,6 +358,7 @@ typedef unsigned char wxUChar; #define wxStrcpy strcpy #define wxStrcspn strcspn #define wxStrdup strdup +#define wxStrlen_ strlen // used in wxStrlen inline function #define wxStrncat strncat #define wxStrncmp strncmp #define wxStrncpy strncpy @@ -231,12 +367,13 @@ typedef unsigned char wxUChar; #define wxStrspn strspn #define wxStrstr strstr #define wxStrtod strtod -// #define wxStrtok strtok_r // this needs a configure check #define wxStrtol strtol #define wxStrtoul strtoul #define wxStrxfrm strxfrm +#undef wxNEED_WX_STRING_H +#endif - // stdio.h functions +#ifdef wxNEED_WX_STDIO_H #define wxFgetc fgetc #define wxFgetchar fgetchar #define wxFgets fgets @@ -263,77 +400,46 @@ typedef unsigned char wxUChar; #define wxUngetc ungetc #define wxVfprint vfprintf #define wxVprintf vprintf +#define wxVsscanf vsscanf #define wxVsprintf vsprintf +#undef wxNEED_WX_STDIO_H +#endif - // stdlib.h functions +#ifdef wxNEED_WX_STDLIB_H #define wxAtof atof #define wxAtoi atoi #define wxAtol atol #define wxGetenv getenv #define wxSystem system +#undef wxNEED_WX_STDLIB_H +#endif - // time.h functions +#ifdef wxNEED_WX_TIME_H #define wxAsctime asctime #define wxCtime ctime #define wxStrftime strftime - -#endif//Unicode +#undef wxNEED_WX_TIME_H #endif +#endif //!Unicode +#if defined(wxNEED_WCSLEN) && wxUSE_UNICODE +#define wcslen wxStrlen +#undef wxNEED_WCSLEN +#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) -#if defined(__VISUALC__) - { return psz ? _tcslen(psz) : 0; } -#elif wxUSE_UNICODE - { return psz ? wcslen(psz) : 0; } -#else - { return psz ? strlen(psz) : 0; } -#endif - -/// portable strcasecmp/_stricmp -inline int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2) -#if defined(__VISUALC__) - { return _tcsicmp(psz1, psz2); } -#elif defined(__BORLANDC__) && !wxUSE_UNICODE - { return stricmp(psz1, psz2); } -#elif defined(__UNIX__) || defined(__GNUWIN32__) -#if !wxUSE_UNICODE - { return strcasecmp(psz1, psz2); } -#else // glibc doesn't seem to have wide char equivalent - { - register wxChar c1, c2; - do { - c1 = wxTolower(*psz1++); - c2 = wxTolower(*psz2++); - } while ( c1 && (c1 == c2) ); - - return c1 - c2; - } +WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) + { return psz ? wxStrlen_(psz) : 0; } #endif -#else - // almost all compilers/libraries provide this function (unfortunately under - // different names), that's why we don't implement our own which will surely - // be more efficient than this code (uncomment to use): - /* - register wxChar c1, c2; - do { - c1 = wxTolower(*psz1++); - c2 = wxTolower(*psz2++); - } while ( c1 && (c1 == c2) ); - - return c1 - c2; - */ - - #error "Please define string case-insensitive compare for your OS/compiler" -#endif // OS/compiler +#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 @@ -345,32 +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 + +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 +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 +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 +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 wxSprintf(wxChar *buf, const wxChar *fmt, ...); -int WXDLLEXPORT wxVsprintf(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 +WXDLLEXPORT double wxAtof(const wxChar *psz); #endif #ifdef wxNEED_WX_STDLIB_H -double WXDLLEXPORT wxAtof(const wxChar *psz); -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