X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..ca8a9e603ae553ce8cee7c2aaaab3459dd945013:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 7dcd0e499f..f764e67eb7 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -18,131 +18,131 @@ // only do SBCS or _UNICODE #if defined (_MBCS ) -#error "MBCS is not supported by wxChar" +# 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 +# undef wxUSE_UNICODE +# define wxUSE_UNICODE 1 #else -#ifndef wxUSE_UNICODE -#define wxUSE_UNICODE 0 -#endif +# 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 +# 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 +# define HAVE_WCSLEN 1 -#include -#if wxUSE_UNICODE // temporary - preserve binary compatibility +# 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 +# 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 +# undef wxUSE_WCHAR_T +# define wxUSE_WCHAR_T 1 // ctype.h functions -#define wxIsalnum _istalnum -#define wxIsalpha _istalpha -#define wxIsctrl _istctrl -#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 +# define wxIsalnum _istalnum +# define wxIsalpha _istalpha +# define wxIsctrl _istctrl +# 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 +# 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 +# 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 +# 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 _tungetc -#define wxVfprint _vftprintf -#define wxVprintf _vtprintf -#define wxVsscanf _vstscanf -#define wxVsprintf _vstprintf +# 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 _tungetc +# define wxVfprint _vftprintf +# 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 +# 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 +# define wxAsctime _tasctime +# define wxCtime _tctime // #elif defined(XXX) // #include XXX-specific files here @@ -156,275 +156,281 @@ typedef _TUCHAR wxUChar; // 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 +# 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 +# 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 +# undef wxUSE_WCHAR_T +# define wxUSE_WCHAR_T 1 -#define wxNEED_WX_CTYPE_H +# 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 +# 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 +# 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 +# elif defined(__BORLANDC__) // WIN16 BC++ +# define wxUSE_WCHAR_T 0 +# elif defined(__WATCOMC__) +# 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 +# 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 +# if wxUSE_UNICODE -#include +# include // this is probably glibc-specific -#if defined(__WCHAR_TYPE__) +# if defined(__WCHAR_TYPE__) typedef __WCHAR_TYPE__ wxChar; typedef signed __WCHAR_TYPE__ wxSChar; typedef unsigned __WCHAR_TYPE__ wxUChar; -#define _T(x) L##x - - // ctype.h functions (wctype.h) -#define wxIsalnum iswalnum -#define wxIsalpha iswalpha -#define wxIsctrl iswcntrl -#define wxIsdigit iswdigit -#define wxIsgraph iswgraph -#define wxIslower iswlower -#define wxIsprint iswprint -#define wxIspunct iswpunct -#define wxIsspace iswspace -#define wxIsupper iswupper -#define wxIsxdigit iswxdigit - -#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 -#define wxStrchr wcschr -#define wxStrcmp wcscmp -#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 -#define wxStrpbrk wcspbrk -#define wxStrrchr wcsrchr -#define wxStrspn wcsspn -#define wxStrstr wcsstr -#define wxStrtod wcstod -#define wxStrtok wcstok -#define wxStrtol wcstol -#define wxStrtoul wcstoul -#define wxStrxfrm wcsxfrm +# define _T(x) L##x + + // ctype.h functions (wctype.h) +# define wxIsalnum iswalnum +# define wxIsalpha iswalpha +# define wxIsctrl iswcntrl +# define wxIsdigit iswdigit +# define wxIsgraph iswgraph +# define wxIslower iswlower +# define wxIsprint iswprint +# define wxIspunct iswpunct +# define wxIsspace iswspace +# define wxIsupper iswupper +# define wxIsxdigit iswxdigit + +# 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 +# define wxStrchr wcschr +# define wxStrcmp wcscmp +# 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 +# define wxStrpbrk wcspbrk +# define wxStrrchr wcsrchr +# define wxStrspn wcsspn +# define wxStrstr wcsstr +# define wxStrtod wcstod +# define wxStrtok wcstok +# define wxStrtol wcstol +# define wxStrtoul wcstoul +# define wxStrxfrm wcsxfrm // glibc doesn't have wc equivalents of the other stuff -#define wxNEED_WX_STDIO_H -#define wxNEED_WX_STDLIB_H -#define wxNEED_WX_TIME_H +# define wxNEED_WX_STDIO_H +# define wxNEED_WX_STDLIB_H +# define wxNEED_WX_TIME_H -#else//!glibc -#error "Please define your compiler's Unicode conventions in wxChar.h" -#endif -#else//!Unicode +# else//!glibc +# error "Please define your compiler's Unicode conventions in wxChar.h" +# endif +# else//!Unicode -#include -#include +# include +# include -#if 0 // temporary - preserve binary compatibilty +# if 0 // temporary - preserve binary compatibilty typedef char wxChar; typedef signed char wxSChar; typedef unsigned char wxUChar; -#else -#define wxChar char -#define wxSChar signed char -#define wxUChar unsigned char -#endif - -#ifdef __FreeBSD__ - #undef _T -#endif -#define _T(x) x - - // ctype.h functions -#define wxIsalnum isalnum -#define wxIsalpha isalpha -#define wxIsctrl isctrl -#define wxIsdigit isdigit -#define wxIsgraph isgraph -#define wxIslower islower -#define wxIsprint isprint -#define wxIspunct ispunct -#define wxIsspace isspace -#define wxIsupper isupper -#define wxIsxdigit isxdigit -#define wxTolower tolower -#define wxToupper toupper - - // locale.h functons -#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 +# else +# define wxChar char +# define wxSChar signed char +# define wxUChar unsigned char +# endif + +# ifdef __FreeBSD__ +# undef _T +# endif +# define _T(x) x + + // ctype.h functions +# define wxIsalnum isalnum +# define wxIsalpha isalpha +# define wxIsctrl isctrl +# define wxIsdigit isdigit +# define wxIsgraph isgraph +# define wxIslower islower +# define wxIsprint isprint +# define wxIspunct ispunct +# define wxIsspace isspace +# define wxIsupper isupper +# define wxIsxdigit isxdigit +# define wxTolower tolower +# define wxToupper toupper + + // locale.h functons +# define wxSetlocale setlocale + + // string.h functions + // #define wxStricmp strcasecmp + // wxStricmp is defined below!! + + // #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 +# if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__) +# 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 -#define wxStrcoll strcoll -#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 -#define wxStrpbrk strpbrk -#define wxStrrchr strrchr -#define wxStrspn strspn -#define wxStrstr strstr -#define wxStrtod strtod -#define wxStrtol strtol -#define wxStrtoul strtoul -#define wxStrxfrm strxfrm -#undef wxNEED_WX_STRING_H -#endif - -#ifdef wxNEED_WX_STDIO_H -#define wxFgetc fgetc -#define wxFgetchar fgetchar -#define wxFgets fgets -#define wxFopen fopen -#define wxFputc fputc -#define wxFputchar fputchar -#define wxFprintf fprintf -#define wxFreopen freopen -#define wxFscanf fscanf -#define wxGetc getc -#define wxGetchar getchar -#define wxGets gets -#define wxPerror perror -#define wxPrintf printf -#define wxPutc putc -#define wxPutchar putchar -#define wxPuts puts -#define wxRemove remove -#define wxRename rename -#define wxScanf scanf -#define wxSprintf sprintf -#define wxSscanf sscanf -#define wxTmpnam tmpnam -#define wxUngetc ungetc -#define wxVfprint vfprintf -#define wxVprintf vprintf -#define wxVsscanf vsscanf -#define wxVsprintf vsprintf -#undef wxNEED_WX_STDIO_H -#endif - -#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 - -#ifdef wxNEED_WX_TIME_H -#define wxAsctime asctime -#define wxCtime ctime -#define wxStrftime strftime -#undef wxNEED_WX_TIME_H -#endif +# ifdef wxNEED_WX_STRING_H +# define wxStrcat strcat +# define wxStrchr strchr +# define wxStrcmp strcmp +# define wxStrcoll strcoll +# 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 +# define wxStrpbrk strpbrk +# define wxStrrchr strrchr +# define wxStrspn strspn +# define wxStrstr strstr +# define wxStrtod strtod +# define wxStrtol strtol +# define wxStrtoul strtoul +# define wxStrxfrm strxfrm +# undef wxNEED_WX_STRING_H +# endif + +# ifdef wxNEED_WX_STDIO_H +# define wxFgetc fgetc +# define wxFgetchar fgetchar +# define wxFgets fgets +# define wxFopen fopen +# define wxFputc fputc +# define wxFputchar fputchar +# define wxFprintf fprintf +# define wxFreopen freopen +# define wxFscanf fscanf +# define wxGetc getc +# define wxGetchar getchar +# define wxGets gets +# define wxPerror perror +# define wxPrintf printf +# define wxPutc putc +# define wxPutchar putchar +# define wxPuts puts +# define wxRemove remove +# define wxRename rename +# define wxScanf scanf +# define wxSprintf sprintf +# define wxSscanf sscanf +# define wxTmpnam tmpnam +# define wxUngetc ungetc +# define wxVfprint vfprintf +# define wxVprintf vprintf +# define wxVsscanf vsscanf +# define wxVsprintf vsprintf +# undef wxNEED_WX_STDIO_H +# endif + +# 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 + +# ifdef wxNEED_WX_TIME_H +# define wxAsctime asctime +# define wxCtime ctime +# define wxStrftime strftime +# undef wxNEED_WX_TIME_H +# endif #endif //!Unicode #if defined(wxNEED_WCSLEN) && wxUSE_UNICODE -#define wcslen wxStrlen -#undef wxNEED_WCSLEN +# define wcslen wxStrlen +# undef wxNEED_WCSLEN #endif /// checks whether the passed in pointer is NULL and if the string is empty @@ -440,25 +446,25 @@ WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) // multibyte<->widechar conversion 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 -#define wxWC2WX wxStrncpy -#define wxWX2WC wxStrncpy -#else -#define wxMB2WX wxStrncpy -#define wxWX2MB wxStrncpy -#define wxWC2WX wxWC2MB -#define wxWX2WC wxMB2WC -#endif +# if wxUSE_UNICODE +# define wxMB2WX wxMB2WC +# define wxWX2MB wxWC2MB +# define wxWC2WX wxStrncpy +# define wxWX2WC wxStrncpy +# else +# define wxMB2WX wxStrncpy +# define wxWX2MB wxStrncpy +# 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 +# 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 @@ -522,8 +528,10 @@ WXDLLEXPORT size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n); #endif #ifdef wxNEED_WX_STDIO_H -#include -#include +# include +# include +WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode); +WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream); WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...); WXDLLEXPORT int wxVprintf(const wxChar *fmt, va_list argptr); WXDLLEXPORT int wxFprintf(FILE *stream, const wxChar *fmt, ...); @@ -545,5 +553,10 @@ WXDLLEXPORT wxChar * wxGetenv(const wxChar *name); WXDLLEXPORT int wxSystem(const wxChar *psz); #endif +#ifdef wxNEED_WX_TIME_H +WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm); +#endif + #endif //_WX_WXCHAR_H_ +