X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5c22d10423fe6271483ca1d6250a3543441a350..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/wxchar.h?ds=sidebyside diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index bd91e9bb05..ea2a3696da 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -12,15 +12,20 @@ #ifndef _WX_WXCHAR_H_ #define _WX_WXCHAR_H_ -//#ifdef __GNUG__ -//#pragma interface "wxchar.h" -//#endif +#ifdef __GNUG__ + #pragma interface "wxchar.h" +#endif // only do SBCS or _UNICODE #if defined (_MBCS ) -# error "MBCS is not supported by wxChar" +// It may be OK anyway. +// # error "MBCS is not supported by wxChar" #endif +// ---------------------------------------------------------------------------- +// first deal with Unicode setting +// ---------------------------------------------------------------------------- + // set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined #if defined(_UNICODE) || defined(UNICODE) # undef wxUSE_UNICODE @@ -29,7 +34,7 @@ # ifndef wxUSE_UNICODE # define wxUSE_UNICODE 0 # endif -#endif +#endif // Unicode // and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1... #if wxUSE_UNICODE @@ -39,16 +44,90 @@ # ifndef UNICODE # define UNICODE # endif -#endif - -// Windows (VC++) has broad TCHAR support -#if defined(__VISUALC__) && defined(__WIN32__) +#endif // Unicode +// Unicode support requires wchar_t +#if wxUSE_UNICODE +# undef wxUSE_WCHAR_T +# define wxUSE_WCHAR_T 1 +#endif // Unicode + +// ---------------------------------------------------------------------------- +// define wxHAVE_TCHAR_FUNCTIONS for the compilers which support the +// wide-character functions +// ---------------------------------------------------------------------------- + +#ifdef __WIN32__ + // VC++ and BC++ starting with 5.2 have TCHAR support + #ifdef __VISUALC__ + #define wxHAVE_TCHAR_FUNCTIONS + #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520) + #define wxHAVE_TCHAR_FUNCTIONS + // w32api isn't yet tchar safe, will be soon, this is a placeholder + #elif defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 10, 0 ) + #define wxHAVE_TCHAR_FUNCTIONS + #include + #include + #include + #endif +#elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400) + // VisualAge 4.0+ supports TCHAR + #define wxHAVE_TCHAR_FUNCTIONS + + // but not stdio.h nor time nor conversion functions + #define wxNO_TCHAR_STDIO + #define wxNO_TCHAR_STDLIB + #define wxNO_TCHAR_TIME + #define wxNO_TCHAR_LOCALE + // + // supplemental VA V4 defs so at least we know what these are + // just define to standard defs + // + + // for wcslen + #include + + // locale.h functons -- not defined in tchar.h + #define wxSetlocale setlocale + // some stdio functions are defined others are not + // these are not + #define wxFgetchar fgetchar + #define wxFopen fopen + #define wxFputchar fputchar + #define wxFreopen freopen + #define wxGets gets + #define wxPerror perror + #define wxPuts puts + #define wxRemove remove + #define wxRename rename + #define wxTmpnam tmpnam + #define wxUngetc ungetc + #define wxVsscanf vsscanf + // stdlib not defined in VA V4 + #if !wxUSE_UNICODE + # define wxAtof atof + #endif + #define wxAtoi atoi + #define wxAtol atol + #define wxGetenv getenv + #define wxSystem system + // time.h functions -- none defined in tchar.h + #define wxAsctime asctime + #define wxCtime ctime +#endif // compilers with (good) TCHAR support + +#ifdef wxHAVE_TCHAR_FUNCTIONS # define HAVE_WCSLEN 1 # include # if wxUSE_UNICODE // temporary - preserve binary compatibility +#if defined(__GNUWIN32__) + #define _TCHAR TCHAR + #define _TSCHAR TCHAR + #define _TUCHAR TCHAR +#endif + typedef _TCHAR wxChar; typedef _TSCHAR wxSChar; typedef _TUCHAR wxUChar; @@ -57,11 +136,17 @@ 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 + + // wchar_t is available + #ifndef wxUSE_WCHAR_T + #define wxUSE_WCHAR_T 1 + #endif // !defined(wxUSE_WCHAR_T) // ctype.h functions +#ifndef wxNO_TCHAR_CTYPE +#ifdef __BORLANDC__ +# include +#endif # define wxIsalnum _istalnum # define wxIsalpha _istalpha # define wxIsctrl _istctrl @@ -75,11 +160,15 @@ typedef _TUCHAR wxUChar; # define wxIsxdigit _istxdigit # define wxTolower _totlower # define wxToupper _totupper +#endif // wxNO_TCHAR_CTYPE // locale.h functons +#ifndef wxNO_TCHAR_LOCALE # define wxSetlocale _tsetlocale +#endif // wxNO_TCHAR_LOCALE // string.h functions +#ifndef wxNO_TCHAR_STRING # define wxStrcat _tcscat # define wxStrchr _tcschr # define wxStrcmp _tcscmp @@ -88,6 +177,7 @@ typedef _TUCHAR wxUChar; # define wxStrcspn _tcscspn # define wxStrftime _tcsftime # define wxStricmp _tcsicmp +# define wxStrnicmp _tcsnicmp # define wxStrlen_ _tcslen // used in wxStrlen inline function # define wxStrncat _tcsncat # define wxStrncmp _tcsncmp @@ -97,12 +187,13 @@ typedef _TUCHAR wxUChar; # define wxStrspn _tcsspn # define wxStrstr _tcsstr # define wxStrtod _tcstod -// is there a _tcstok[_r] ? # define wxStrtol _tcstol # define wxStrtoul _tcstoul # define wxStrxfrm _tcsxfrm +#endif // wxNO_TCHAR_STRING // stdio.h functions +#ifndef wxNO_TCHAR_STDIO # define wxFgetc _fgettc # define wxFgetchar _fgettchar # define wxFgets _fgetts @@ -131,120 +222,8 @@ typedef _TUCHAR wxUChar; # define wxVprintf _vtprintf # define wxVsscanf _vstscanf # define wxVsprintf _vstprintf - - // stdlib.h functions -# if !wxUSE_UNICODE -# define wxAtof atof -# endif -# define wxAtoi _ttoi -# define wxAtol _ttol -# define wxGetenv _tgetenv -# define wxSystem _tsystem - - // time.h functions -# define wxAsctime _tasctime -# define wxCtime _tctime - -// #elif defined(XXX) - // #include XXX-specific files here - // typeddef YYY wxChar; - - // translate wxZZZ names - -#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 -// This test is for C++Builder -#if __BORLANDC__ >= 0x530 -# define wxUSE_WCHAR_T 0 -#else -# define wxUSE_WCHAR_T 1 -# define wxNEED_WCSLEN -#endif -# 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 - -// VisualAge C++ V4.0 has broad tchar support -#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 - -# define HAVE_WCSLEN 1 -# include -# 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 - - // ctype.h functions -# define wxIsalnum _istalnum -# define wxIsalpha _istalpha -# define wxIsctrl _istcntrl -# define wxIsdigit _istdigit -# define wxIsgraph _istgraph -# define wxIslower _istlower -# define wxIsprint _istprint -# define wxIspunct _istpunct -# define wxIsspace _istspace -# define wxIsupper _istupper -# define wxIsxdigit _istxdigit -# define wxTolower _totlower -# define wxToupper _totupper - - // locale.h functons -- not defined in tchar.h -# define wxSetlocale setlocale - - // string.h functions -# define wxStrcat _tcscat -# define wxStrchr _tcschr -# define wxStrcmp _tcscmp -# define wxStrcoll _tcscoll -# 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 -# define wxStrpbrk _tcspbrk -# define wxStrrchr _tcsrchr -# define wxStrspn _tcsspn -# define wxStrstr _tcsstr -# define wxStrtod _tcstod -// is there a _tcstok[_r] ? -# define wxStrtol _tcstol -# define wxStrtoul _tcstoul -# define wxStrxfrm _tcsxfrm - - // stdio.h functions +#elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400) + // it has some stdio.h functions, apparently # define wxFgetc _fgettc # define wxFgets _fgetts # define wxFputc _fputtc @@ -261,50 +240,33 @@ typedef _TUCHAR wxUChar; # define wxVfprint _vftprintf # define wxVprintf _vtprintf # define wxVsprintf _vstprintf -// not defined in tchar.h -# define wxFgetchar fgetchar -# define wxFopen fopen -# define wxFputchar fputchar -# define wxFreopen freopen -# define wxGets gets -# define wxPerror perror -# define wxPuts puts -# define wxRemove remove -# define wxRename rename -# define wxTmpnam tmpnam -# define wxUngetc ungetc -# define wxVsscanf vsscanf - - // stdlib.h functions -- none defined in tchar.h +#endif // wxNO_TCHAR_STDIO + + // stdlib.h functions +#ifndef wxNO_TCHAR_STDLIB # if !wxUSE_UNICODE -# define wxAtof atof +# define wxAtof atof # endif -# define wxAtoi atoi -# define wxAtol atol -# define wxGetenv getenv -# define wxSystem system - - // time.h functions -- none defined in tchar.h -# define wxAsctime asctime -# define wxCtime ctime - -// #elif defined(XXX) - // #include XXX-specific files here - // typeddef YYY wxChar; +# define wxAtoi _ttoi +# define wxAtol _ttol +# define wxGetenv _tgetenv +# define wxSystem _tsystem +#endif // wxNO_TCHAR_STDLIB - // translate wxZZZ names + // time.h functions +#ifndef wxNO_TCHAR_TIME +# define wxAsctime _tasctime +# define wxCtime _tctime +#endif // wxNO_TCHAR_TIME -#else//!TCHAR-aware compilers +#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(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__) +# if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__)) # define wxUSE_WCHAR_T 1 # else # define wxUSE_WCHAR_T 0 @@ -315,21 +277,23 @@ typedef _TUCHAR wxUChar; # define wxUSE_WCHAR_T 0 # elif defined(__WATCOMC__) # define wxUSE_WCHAR_T 0 +# elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400) +# define wxUSE_WCHAR_T 1 # else // add additional compiler checks if this fails # define wxUSE_WCHAR_T 1 # endif -# endif//wxUSE_UNICODE +# endif // !defined(wxUSE_WCHAR_T) # if wxUSE_WCHAR_T # ifdef HAVE_WCSTR_H # include # else -# ifndef __FreeBSD__ -# include -# else +# if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__)) # include # define wxNEED_WCSLEN +# else +# include # endif # endif # endif @@ -415,7 +379,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar; # define wxUChar unsigned char # endif -# ifdef __FreeBSD__ +# if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__)) # undef _T # endif @@ -559,12 +523,12 @@ typedef unsigned __WCHAR_TYPE__ wxUChar; # undef wxNEED_WCSLEN #endif -/// checks whether the passed in pointer is NULL and if the string is empty -WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } +// checks whether the passed in pointer is NULL and if the string is empty +inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } #ifndef wxNEED_WX_STRING_H -/// safe version of strlen() (returns 0 if passed NULL pointer) -WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) +// safe version of strlen() (returns 0 if passed NULL pointer) +inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } #endif @@ -609,7 +573,8 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt #endif #ifndef wxSetlocale -WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale); +class wxWCharBuffer; +WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale); #endif #ifdef wxNEED_WCSLEN // for use in buffer.h @@ -658,6 +623,8 @@ WXDLLEXPORT size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n); # include WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode); WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream); +WXDLLEXPORT int wxRemove(const wxChar *path); +WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath); WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...); WXDLLEXPORT int wxVprintf(const wxChar *fmt, va_list argptr); WXDLLEXPORT int wxFprintf(FILE *stream, const wxChar *fmt, ...); @@ -683,6 +650,17 @@ WXDLLEXPORT int wxSystem(const wxChar *psz); WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm); #endif +// under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks +// the file parsing - this may be true for 5.0 as well, update #ifdef then +#if defined(__VISUALC__) && (__VISUALC__ >= 1200) && !wxUSE_UNICODE + #undef wxIsspace + #define wxIsspace(c) ((((unsigned)c) < 128) && isspace(c)) +#endif // VC++ + +// ---------------------------------------------------------------------------- +// common macros which are always defined +// ---------------------------------------------------------------------------- + // although global macros with such names are really bad, we want to have // another name for _T() which should be used to avoid confusion between _T() // and _() in wxWindows sources