/////////////////////////////////////////////////////////////////////////////
-// Name: wxchar.h
+// Name: wx/wxchar.h
// Purpose: Declarations common to wx char/wchar_t usage (wide chars)
-// Author: Joel Farley
-// Modified by:
+// Author: Joel Farley, Ove Kåven
+// Modified by: Vadim Zeitlin, Robert Roebling
// Created: 1998/06/12
// RCS-ID: $Id$
-// Copyright: (c) wxWindows copyright
+// Copyright: (c) 1998-2002 wxWindows dev team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_WXCHAR_H_
#define _WX_WXCHAR_H_
-#ifdef __GNUG__
-#pragma interface "wxchar.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+ #pragma interface "wxchar.h"
#endif
-// only do SBCS or _UNICODE
-#if defined (_MBCS )
-#error "MBCS is not supported by wxChar"
-#endif
+// ----------------------------------------------------------------------------
+// first deal with Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
+// and is used by wxWindows, _UNICODE and/or UNICODE may be defined or used by
+// the system headers so bring these settings in sync
+// ----------------------------------------------------------------------------
// 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
-#endif
+ #ifndef wxUSE_UNICODE
+ #define wxUSE_UNICODE 0
+ #endif
+#endif // Unicode
// 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__)
+ #ifndef _UNICODE
+ #define _UNICODE
+ #endif
+ #ifndef UNICODE
+ #define UNICODE
+ #endif
+#endif // Unicode
+
+// check whether we have wchar_t
+#if !defined(wxUSE_WCHAR_T)
+ #if defined(__WIN16__)
+ // no wchar_t under Win16 regadrless of compiler used
+ #define wxUSE_WCHAR_T 0
+ #elif defined(__UNIX__)
+ #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__)
+ #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(__WATCOMC__)
+ #define wxUSE_WCHAR_T 0
+ #elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
+ #define wxUSE_WCHAR_T 0
+ #else
+ // add additional compiler checks if this fails
+ #define wxUSE_WCHAR_T 1
+ #endif
+#endif // !defined(wxUSE_WCHAR_T)
+
+// Unicode support requires wchar_t
+#if wxUSE_UNICODE && !wxUSE_WCHAR_T
+ #error "wchar_t must be available in Unicode build"
+#endif // Unicode
+
+// ----------------------------------------------------------------------------
+// standard headers we need here
+//
+// NB: don't include any wxWindows headers here because almost of them include
+// this one!
+// ----------------------------------------------------------------------------
+
+// Required for wxPrintf() etc
+#include <stdarg.h>
-#include <tchar.h>
-#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
+#if defined(__CYGWIN__)
+ #ifndef HAVE_WCSLEN
+ #define HAVE_WCSLEN
+ #endif // !HAVE_WCSLEN
+ #include <stddef.h>
#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 _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
-
- // 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 _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
-
- // 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 <tchar.h>
-#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
+// non Unix compilers which do have wchar.h (but not tchar.h which is included
+// below and which includes wchar.h anyhow)
+#if defined(__MWERKS__) || defined(__VISAGECPP__)
+ #ifndef HAVE_WCHAR_H
+ #define HAVE_WCHAR_H
+ #endif
#endif
- // wchar_t is available
-#undef wxUSE_WCHAR_T
-#define wxUSE_WCHAR_T 1
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <winnt.h>
-
- // 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 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)
- #define wxUSE_WCHAR_T 1
- #else
- #define wxUSE_WCHAR_T 0
- #endif
- #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 <wcstr.h>
-#else
-#include <wchar.h>
-#endif
-#endif
-
-// check whether we are doing Unicode
-#if wxUSE_UNICODE
-
-#include <wctype.h>
-
-// this is probably glibc-specific
-#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
-
-// 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
-
-#else//!glibc
-#error "Please define your compiler's Unicode conventions in wxChar.h"
-#endif
-#else//!Unicode
-
-#include <ctype.h>
-#include <string.h>
-
-#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 HAVE_WCHAR_H
+ // include wchar.h to get wcslen() declaration used by wx/buffer.h
+ #include <wchar.h>
+ #elif defined(HAVE_WCSTR_H)
+ // old compilers have wcslen() here
+ #include <wcstr.h>
+ #elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
+ // include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp
+ #include <stdlib.h>
+ size_t WXDLLEXPORT wcslen(const wchar_t *s);
+ #endif // HAVE_WCHAR_H
+#endif // wxUSE_WCHAR_T
+
+// ----------------------------------------------------------------------------
+// define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type
+// mapped to either char or wchar_t depending on the ASCII/Unicode mode and have
+// the function mapping _tfoo() -> foo() or wfoo()
+// ----------------------------------------------------------------------------
+
+// VC++ and BC++ starting with 5.2 have TCHAR support
+#ifdef __VISUALC__
+ #define wxHAVE_TCHAR_SUPPORT
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
+ #define wxHAVE_TCHAR_SUPPORT
+ #include <ctype.h>
+#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
+ #define wxHAVE_TCHAR_SUPPORT
+ #include <stddef.h>
+ #include <string.h>
+ #include <ctype.h>
+#elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+ // VZ: the old VisualAge definitions were completely wrong and had no
+ // chance at all to work in Unicode build anyhow so let's pretend that
+ // VisualAge does _not_ support TCHAR for the moment (as indicated by
+ // "0 &&" above) until someone really has time to delve into Unicode
+ // issues under OS/2
+
+ // VisualAge 4.0+ supports TCHAR
+ #define wxHAVE_TCHAR_SUPPORT
+#endif // compilers with (good) TCHAR support
+
+#ifdef wxHAVE_TCHAR_SUPPORT
+ // get TCHAR definition if we've got it
+ #include <tchar.h>
+
+ // we surely do have wchar_t if we have TCHAR
+ #ifndef wxUSE_WCHAR_T
+ #define wxUSE_WCHAR_T 1
+ #endif // !defined(wxUSE_WCHAR_T)
+
+ // and we also do have wcslen()
+ #ifndef HAVE_WCSLEN
+ #define HAVE_WCSLEN
+ #endif
+#endif // wxHAVE_TCHAR_SUPPORT
+
+// ----------------------------------------------------------------------------
+// define wxChar type
+// ----------------------------------------------------------------------------
+
+// TODO: define wxCharInt to be equal to either int or wint_t?
-#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
-#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
-#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
-#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; }
-
-#ifndef wxNEED_WX_STRING_H
-/// safe version of strlen() (returns 0 if passed NULL pointer)
-inline size_t WXDLLEXPORT wxStrlen(const wxChar *psz)
- { return psz ? wxStrlen_(psz) : 0; }
-#endif
-
+ typedef char wxChar;
+ typedef signed char wxSChar;
+ typedef unsigned char wxUChar;
+#else // Unicode
+ // VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as
+ // signed/unsigned version of it which (a) makes sense to me (unlike
+ // char wchar_t is always unsigned) and (b) was how the previous
+ // definitions worked so keep it like this
+
+ // GNU libc has __WCHAR_TYPE__ which requires special treatment, see
+ // comment below
+ #if !defined(__WCHAR_TYPE__) || \
+ (!defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 96))
+ // standard case
+ typedef wchar_t wxChar;
+ typedef wchar_t wxSChar;
+ typedef wchar_t wxUChar;
+ #else // __WCHAR_TYPE__ and gcc < 2.96
+ // VS: wxWindows used to define wxChar as __WCHAR_TYPE__ here. However,
+ // this doesn't work with new GCC 3.x compilers because wchar_t is
+ // C++'s builtin type in the new standard. OTOH, old compilers (GCC
+ // 2.x) won't accept new definition of wx{S,U}Char, therefore we
+ // have to define wxChar conditionally depending on detected
+ // compiler & compiler version.
+ // with old definition of wxChar.
+ typedef __WCHAR_TYPE__ wxChar;
+ typedef __WCHAR_TYPE__ wxSChar;
+ typedef __WCHAR_TYPE__ wxUChar;
+ #endif // __WCHAR_TYPE__
+#endif // ASCII/Unicode
+
+// ----------------------------------------------------------------------------
+// define _T() and related macros
+// ----------------------------------------------------------------------------
+
+// BSD systems define _T() to be something different in ctype.h, override it
+#if defined(__FreeBSD__) || defined(__DARWIN__)
+ #include <ctype.h>
+ #undef _T
+#endif
+
+// could already be defined by tchar.h (it's quasi standard)
+#ifndef _T
+ #if !wxUSE_UNICODE
+ #define _T(x) x
+ #else // Unicode
+ #define _T(x) L ## x
+ #endif // ASCII/Unicode
+#endif // !defined(_T)
+
+// although global macros with such names are normally bad, we want to have
+// another name for _T() which should be used to avoid confusion between _T()
+// and _() in wxWindows sources
+#define wxT(x) _T(x)
+
+// Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs
+#ifndef __TFILE__
+ #define __XFILE__(x) wxT(x)
+ #define __TFILE__ __XFILE__(__FILE__)
+#endif
+
+#ifndef __TDATE__
+ #define __XDATE__(x) wxT(x)
+ #define __TDATE__ __XDATE__(__DATE__)
+#endif
+
+#ifndef __TTIME__
+ #define __XTIME__(x) wxT(x)
+ #define __TTIME__ __XTIME__(__TIME__)
+#endif
+
+// ----------------------------------------------------------------------------
+// define wxFoo() function for each standard foo() function whose signature
+// (exceptionally including the return type) includes any mention of char:
+// wxFoo() is going to be a Unicode-friendly version of foo(), i.e. will have
+// the same signature but with char replaced by wxChar which allows us to use
+// it in Unicode build as well
+// ----------------------------------------------------------------------------
+
+#ifdef wxHAVE_TCHAR_SUPPORT
+ // 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
+
+ // 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 wxStrnicmp _tcsnicmp
+ #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 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 wxFputs _fputts
+ #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 wxScanf _tscanf
+ #define wxSprintf _stprintf
+ #define wxSscanf _stscanf
+ #define wxTmpnam _ttmpnam
+ #define wxUngetc _tungetc
+ #define wxVfprintf _vftprintf
+ #define wxVprintf _vtprintf
+ #define wxVsscanf _vstscanf
+ #define wxVsprintf _vstprintf
+
+ // special case: these functions are missing under Win9x with Unicows so we
+ // have to implement them ourselves
+ #if wxUSE_UNICODE_MSLU
+ #define wxRemove wxMSLU__tremove
+ #define wxRename wxMSLU__trename
+ #else
+ #define wxRemove _tremove
+ #define wxRename _trename
+ #endif
+
+ // stdlib.h functions
+ #define wxAtoi _ttoi
+ #define wxAtol _ttol
+ // #define wxAtof _tttof -- notice that there is no such thing (why?)
+ #define wxGetenv _tgetenv
+ #define wxSystem _tsystem
+
+ // time.h functions
+ #define wxAsctime _tasctime
+ #define wxCtime _tctime
+#else // !TCHAR-aware compilers
+ #if wxUSE_UNICODE
+ #include <wctype.h>
+
+ // this is probably glibc-specific
+ #if defined(__WCHAR_TYPE__)
+ // 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 // !glibc 2.0
+ #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 wxFgetc fgetwc
+ #define wxFgetchar fgetwchar
+ #define wxFgets fgetws
+ #define wxFputc fputwc
+ #define wxFputchar fputwchar
+ #define wxGetc getwc
+ #define wxGetchar getwchar
+ #define wxGets getws
+ #define wxUngetc ungetwc
+
+ #ifdef HAVE_FPUTWC
+ #define wxPutc wputc
+ #define wxPutchar wputchar
+ #define wxPuts putws
+ #define wxFputs fputws
+ #else
+ #define wxNEED_FPUTWC
+
+ #include <stdio.h>
+
+ int wxFputs(const wxChar *ch, FILE *stream);
+ int wxPutc(wxChar ch, FILE *stream);
+
+ #define wxPuts(ws) wxFputs(ws, stdout)
+ #define wxPutchar(wch) wxPutc(wch, stdout)
+ #endif
+
+ // we need %s to %ls conversion for printf and scanf etc
+ #define wxNEED_PRINTF_CONVERSION
+
+ // glibc doesn't have wide char equivalents of the other stuff so
+ // use our own versions
+ #define wxNEED_WX_STDIO_H
+ #define wxNEED_WX_STDLIB_H
+ #define wxNEED_WX_TIME_H
+ #else // !glibc
+ #error "Please define wide character functions for your environment"
+ #endif
+ #else // ASCII
+ #include <ctype.h>
+ #include <string.h>
+
+ // 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 wxStrcat strcat
+ #define wxStrchr strchr
+ #define wxStrcmp strcmp
+ #define wxStrcoll strcoll
+ #define wxStrcpy strcpy
+ #define wxStrcspn strcspn
+ #if !defined(__MWERKS__) || !defined(__WXMAC__)
+ #define wxStrdup strdup
+ #endif
+ // wxStricmp and wxStrnicmp are defined below
+ #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
+ #ifdef HAVE_STRTOK_R
+ #define wxStrtok(str, sep, last) strtok_r(str, sep, last)
+ #else
+ #define wxStrtok(str, sep, last) strtok(str, sep)
+ #endif
+ #define wxStrtol strtol
+ #define wxStrtoul strtoul
+ #define wxStrxfrm strxfrm
+
+ // stdio.h functions
+ #define wxFopen fopen
+ #define wxFreopen freopen
+ #define wxPerror perror
+ #define wxRemove remove
+ #define wxRename rename
+ #define wxTmpnam tmpnam
+
+ #define wxFgetc fgetc
+ #define wxFgetchar fgetchar
+ #define wxFgets fgets
+ #define wxFputc fputc
+ #define wxFputchar fputchar
+ #define wxFprintf fprintf
+ #define wxFscanf fscanf
+ #define wxGetc getc
+ #define wxGetchar getchar
+ #define wxGets gets
+ #define wxPrintf printf
+ #define wxPutc putc
+ #define wxPutchar putchar
+ #define wxPuts puts
+ #define wxScanf scanf
+ #define wxSprintf sprintf
+ #define wxSscanf sscanf
+ #define wxUngetc ungetc
+ #define wxVfprintf vfprintf
+ #define wxVprintf vprintf
+ #define wxVsscanf vsscanf
+ #define wxVsprintf vsprintf
+
+ // stdlib.h functions
+ #define wxAtof atof
+ #define wxAtoi atoi
+ #define wxAtol atol
+ #define wxGetenv getenv
+ #define wxSystem system
+
+ // time.h functions
+ #define wxAsctime asctime
+ #define wxCtime ctime
+ #define wxStrftime strftime
+ #endif // Unicode/ASCII
+#endif // TCHAR-aware compilers/the others
+
+// ----------------------------------------------------------------------------
+// various special cases
+// ----------------------------------------------------------------------------
+
+// define wxStricmp and wxStrnicmp for various compilers
+//
+// note that in Unicode mode we definitely are going to need our own version
+#if !defined(wxStricmp) && !wxUSE_UNICODE
+ #if defined(__BORLANDC__) || defined(__WATCOMC__) || \
+ defined(__SALFORDC__) || defined(__VISAGECPP__) || \
+ defined(__EMX__) || defined(__DJGPP__)
+ #define wxStricmp stricmp
+ #define wxStrnicmp strnicmp
+ #elif defined(__SC__) || defined(__VISUALC__) || \
+ (defined(__MWERKS__) && defined(__INTEL__))
+ #define wxStricmp _stricmp
+ #define wxStrnicmp _strnicmp
+ #elif defined(__UNIX__) || defined(__GNUWIN32__)
+ #define wxStricmp strcasecmp
+ #define wxStrnicmp strncasecmp
+ // #else -- use wxWindows implementation
+ #endif
+#endif // !defined(wxStricmp)
+
+// checks whether the passed in pointer is NULL and if the string is empty
+inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
+
+// safe version of strlen() (returns 0 if passed NULL pointer)
+inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
+
+// define wxWcslen() which should be always available if wxUSE_WCHAR_T == 1 (as
+// it's used in wx/buffer.h)
#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);
-#if wxUSE_UNICODE
-#define wxMB2WX wxMB2WC
-#define wxWX2MB wxWC2MB
-#define wxWC2WX wxStrncpy
-#define wxWX2WC wxStrncpy
+ #ifdef HAVE_WCSLEN
+ #define wxWcslen wcslen
+ #else
+ inline size_t wxWcslen(const wchar_t *s)
+ {
+ size_t n = 0;
+ while ( *s++ )
+ n++;
+
+ return n;
+ }
+ #endif
+#endif // wxUSE_WCHAR_T
+
+WXDLLEXPORT bool wxOKlibc(); // for internal use
+
+// ----------------------------------------------------------------------------
+// printf() family saga
+// ----------------------------------------------------------------------------
+
+/*
+ First of all, we always want to define safe snprintf() function to be used
+ instead of sprintf(). Some compilers already have it (or rather vsnprintf()
+ which we really need...), otherwise we implement it using our own printf()
+ code.
+
+ We define function with a trailing underscore here because the real one is a
+ wrapper around it as explained below
+ */
+#ifdef wxHAVE_TCHAR_SUPPORT
+ #define wxVsnprintf_ _vsntprintf
+ #define wxSnprintf_ _sntprintf
+#else // !TCHAR
+ #if wxUSE_UNICODE
+ #if defined(HAVE_VSWPRINTF)
+ #define wxVsnprintf_ vswprintf
+ #endif
+ #else // ASCII
+ // all versions of CodeWarrior supported by wxWindows apparently have
+ // vsnprintf()
+ #if defined(HAVE_VSNPRINTF) || defined(__MWERKS__)
+ // assume we have snprintf() too if we have vsnprintf()
+ #define wxVsnprintf_ vsnprintf
+ #define wxSnprintf_ snprintf
+ #endif
+ #endif
+#endif // TCHAR/!TCHAR
+
+#ifndef wxVsnprintf_
+ // no [v]snprintf(), cook our own
+ WXDLLEXPORT int wxSnprintf_(wxChar *buf, size_t len, const wxChar *format,
+ ...) ATTRIBUTE_PRINTF_3;
+ WXDLLEXPORT int wxVsnprintf_(wxChar *buf, size_t len, const wxChar *format,
+ va_list argptr);
+#endif
+
+/*
+ In Unicode mode we need to have all standard functions such as wprintf() and
+ so on but not all systems have them so use our own implementations in this
+ case.
+ */
+#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF)
+ #define wxNEED_WPRINTF
+#endif
+
+/*
+ More Unicode complications: although both ANSI C and C++ define a number of
+ wide character functions such as wprintf(), not all environments have them.
+ Worse, those which do have different behaviours: under Windows, %s format
+ specifier changes its meaning in Unicode build and expects a Unicode string
+ while under Unix/POSIX it still means an ASCII string even for wprintf() and
+ %ls has to be used for wide strings.
+
+ We choose to always emulate Windows behaviour as more useful for us so even
+ if we have wprintf() we still must wrap it in a non trivial wxPrintf().
+
+ However, if we don't have any vswprintf() at all we don't need to redefine
+ anything as our own wxVsnprintf_() already behaves as needed.
+*/
+#ifndef wxVsnprintf_
+ #undef wxNEED_PRINTF_CONVERSION
+#endif
+
+#if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF)
+ // we need to implement all wide character printf and scanf functions
+ // either because we don't have them at all or because they don't have the
+ // semantics we need
+
+ #include <stdio.h> // for FILE
+
+ int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2;
+ int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3;
+ int wxFscanf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3;
+ int wxVsscanf( const wxChar *str, const wxChar *format, va_list ap );
+ int wxPrintf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_2;
+ int wxSprintf( wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3;
+ int wxFprintf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3;
+ int wxVfprintf( FILE *stream, const wxChar *format, va_list ap );
+ int wxVprintf( const wxChar *format, va_list ap );
+ int wxVsprintf( wxChar *str, const wxChar *format, va_list ap );
+#endif // wxNEED_PRINTF_CONVERSION
+
+// these 2 can be simply mapped to the versions with underscore at the end
+// if we don't have to do the conversion
+#ifdef wxNEED_PRINTF_CONVERSION
+ int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_4;
+ int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap );
#else
-#define wxMB2WX wxStrncpy
-#define wxWX2MB wxStrncpy
-#define wxWC2WX wxWC2MB
-#define wxWX2WC wxMB2WC
-#endif
-#endif
-bool WXDLLEXPORT wxOKlibc(); // for internal use
+ #define wxSnprintf wxSnprintf_
+ #define wxVsnprintf wxVsnprintf_
+#endif
+
+// ----------------------------------------------------------------------------
+// various functions which might not be available in libc and for which we
+// provide our own replacements in wxchar.cpp
+// ----------------------------------------------------------------------------
+
+// ctype.h functions
+//
+// VZ: note that this is never defined currently
+#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 // wxNEED_WX_CTYPE_H
+
+// 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++
+
+
+// string.h functions
+//
+// VZ: this is never defined neither currently
+#ifdef wxNEED_WX_STRING_H
+ WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src);
+ WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c);
+ WXDLLEXPORT wxChar * wxStrchr(wxChar *s, wxChar c)
+ { return (wxChar *)wxStrchr((const wxChar *)s, 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 const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
+ WXDLLEXPORT wxChar * wxStrpbrk(wxChar *s, const wxChar *accept)
+ { return (wxChar *)wxStrpbrk((const wxChar *)s, accept); }
+ WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c);
+ WXDLLEXPORT wxChar * wxStrrchr(wxChar *s, wxChar c)
+ { return (wxChar *)wxStrrchr((const wxChar *)s, c); }
+ WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept);
+ WXDLLEXPORT const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
+ WXDLLEXPORT wxChar *wxStrstr(wxChar *haystack, const wxChar *needle)
+ { return (wxChar *)wxStrstr((const wxChar *)haystack, 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 // wxNEED_WX_STRING_H
-// 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 wxStrnicmp
+WXDLLEXPORT int wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t len);
#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);
+class WXDLLEXPORT wxWCharBuffer;
+WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
#endif
-#ifdef wxNEED_WCSLEN // for use in buffer.h
-size_t WXDLLEXPORT wcslen(const wchar_t *s);
-#endif
+// stdio.h functions
+#ifdef wxNEED_WX_STDIO_H
+ #include <stdio.h>
+ 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);
-#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);
-#endif
+ // *printf() family is handled separately
+#endif // wxNEED_WX_STDIO_H
-#ifdef wxNEED_WX_STDIO_H
-#include <stdio.h>
-#include <stdarg.h>
-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);
-#endif
+// stdlib.h functions
#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
- //_WX_WXCHAR_H_
+
+// time.h functions
+#ifdef wxNEED_WX_TIME_H
+ WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max,
+ const wxChar *fmt, const struct tm *tm);
+#endif // wxNEED_WX_TIME_H
+
+// ----------------------------------------------------------------------------
+// multibyte to wide char conversion functions and macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_WCHAR_T
+ // 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
+#else // !wxUSE_UNICODE
+ // 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
+
+#endif //_WX_WXCHAR_H_
+
projects / wxWidgets.git / blobdiff