From c71737394929254138c00416cdb9f2e5ba11ac6b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Dec 1999 07:54:58 +0000 Subject: [PATCH] patch from Ricky Gonzales for the Unicode support for BC 5.02+ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxchar.h | 113 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 109 insertions(+), 4 deletions(-) diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index bd91e9bb05..f15f542060 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -152,7 +152,114 @@ typedef _TUCHAR wxUChar; // translate wxZZZ names #elif defined(__BORLANDC__) && defined(__WIN32__) +#if (__BORLANDC__ >= 0x520) +// BC++ 5.02 and later has broad tchar support +# define HAVE_WCSLEN 1 + +# 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 +# define wxSetlocale _tsetlocale + + // 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 +# define wxFgetc _fgettc +# define wxFgetchar _fgettchar +# define wxFgets _fgetts +# define wxFopen _tfopen +# define wxFputc _fputtc +# define wxFputchar _fputtchar +# define wxFprintf _ftprintf +# define wxFreopen _tfreopen +# define wxFscanf _ftscanf +# define wxGetc _gettc +# define wxGetchar _gettchar +# define wxGets _getts +# define wxPerror _tperror +# define wxPrintf _tprintf +# define wxPutc _puttc +# define wxPutchar _puttchar +# define wxPuts _putts +# define wxRemove _tremove +# define wxRename _trename +# define wxScanf _tscanf +# define wxSprintf _stprintf +# define wxSscanf _stscanf +# define wxTmpnam _ttmpnam +# define wxUngetc _ungettc +# define wxVfprint _vftprintf +# define wxVprintf _vtprintf +# define wxVsscanf _vstscanf +# define wxVsprintf _vstprintf + + // stdlib.h functions +# define wxAtof _ttof +# 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 + +#else // 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 @@ -170,12 +277,8 @@ typedef _TUCHAR wxUChar; // 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 @@ -183,6 +286,8 @@ typedef _TUCHAR wxUChar; # define wxNEED_WX_STDLIB_H # define wxNEED_WX_TIME_H +#endif // __BORLANDC__ >= 0x530 + // VisualAge C++ V4.0 has broad tchar support #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 -- 2.45.2