OSX fix

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index a31a3825e40ad1ae9d0980f148e1bcc81697895c..21afa7f864348adaba983c8930dace21ae019c54 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -13,537 +13,707 @@
 #define _WX_WXCHAR_H_
 
 #ifdef __GNUG__
 #define _WX_WXCHAR_H_
 
 #ifdef __GNUG__

-#pragma interface "wxchar.h"
+    #pragma interface "wxchar.h"

 #endif
 
 // only do SBCS or _UNICODE
 #if defined (_MBCS )
 #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
 
 #endif
 

+// ----------------------------------------------------------------------------
+// first deal with Unicode setting
+// ----------------------------------------------------------------------------
+

 // set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined
 #if defined(_UNICODE) || defined(UNICODE)
 // 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
 #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
 
 // 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 // 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
+// ----------------------------------------------------------------------------
+
+// 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
+#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
+    #define wxHAVE_TCHAR_FUNCTIONS
+    #include <stddef.h>
+    #include <string.h>
+    #include <ctype.h>
+#elif defined(__CYGWIN__)
+    #ifndef HAVE_WCSLEN
+        #define HAVE_WCSLEN
+    #endif // !HAVE_WCSLEN
+    #include <stddef.h>
+    #include <wchar.h>
+#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 <wchar.h>
+
+    // 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
+#elif defined(__MWERKS__)
+    // for wcslen
+    #if wxUSE_WCHAR_T
+    #include <wchar.h>
+    #endif
+#endif // compilers with (good) TCHAR support
+
+#ifdef wxHAVE_TCHAR_FUNCTIONS
+#  define HAVE_WCSLEN 1
+
+#  include <tchar.h>
+
+#  if wxUSE_UNICODE // temporary - preserve binary compatibility
+#if defined(__GNUWIN32__)
+    #define _TCHAR   TCHAR
+    #define _TSCHAR  TCHAR
+    #define _TUCHAR  TCHAR

 #endif
 
 #endif
 

-// Windows (VC++) has broad TCHAR support
-#if defined(__VISUALC__) && defined(__WIN32__)
-
-#define HAVE_WCSLEN 1
-
-#include <tchar.h>
-#if wxUSE_UNICODE // temporary - preserve binary compatibility

 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 typedef  _TUCHAR     wxUChar;
 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
+#  else
+#    define wxChar char
+#    define wxSChar signed char
+#    define wxUChar unsigned char
+#  endif
+
+    // wchar_t is available
+    #ifndef wxUSE_WCHAR_T
+        #define wxUSE_WCHAR_T 1
+    #endif // !defined(wxUSE_WCHAR_T)

 
    // ctype.h functions
 
    // 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
+#ifndef wxNO_TCHAR_CTYPE
+#ifdef __BORLANDC__
+#  include <ctype.h>
+#endif
+#  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
+#endif // wxNO_TCHAR_CTYPE

 
    // locale.h functons
 
    // locale.h functons

-#define  wxSetlocale _tsetlocale
+#ifndef wxNO_TCHAR_LOCALE
+#  define  wxSetlocale _tsetlocale
+#endif // wxNO_TCHAR_LOCALE

 
    // string.h functions
 
    // 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
+#ifndef wxNO_TCHAR_STRING
+#  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
+#endif // wxNO_TCHAR_STRING

 
    // stdio.h functions
 
    // 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
+#ifndef wxNO_TCHAR_STDIO
+#  if wxUSE_UNICODE_MSLU
+#    define  wxRemove    wxMSLU__tremove
+#    define  wxRename    wxMSLU__trename
+#  else
+#    define  wxRemove    _tremove
+#    define  wxRename    _trename
+#  endif
+#  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  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
+#elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+    // it has some stdio.h functions, apparently
+#  define  wxFgetc     _fgettc
+#  define  wxFgets     _fgetts
+#  define  wxFputc     _fputtc
+#  define  wxFprintf   _ftprintf
+#  define  wxFscanf    _ftscanf
+#  define  wxGetc      _gettc
+#  define  wxGetchar   _gettchar
+#  define  wxPrintf    _tprintf
+#  define  wxPutc      _puttc
+#  define  wxPutchar   _puttchar
+#  define  wxScanf     _tscanf
+#  define  wxSprintf   _stprintf
+#  define  wxSscanf    _stscanf
+#  define  wxVfprint   _vftprintf
+#  define  wxVprintf   _vtprintf
+#  define  wxVsprintf  _vstprintf
+#endif // wxNO_TCHAR_STDIO

 
    // stdlib.h functions
 
    // stdlib.h functions

-#if !wxUSE_UNICODE
-#define  wxAtof      atof
-#endif
-#define  wxAtoi      _ttoi
-#define  wxAtol      _ttol
-#define  wxGetenv    _tgetenv
-#define  wxSystem    _tsystem
+#ifndef wxNO_TCHAR_STDLIB
+#  if !wxUSE_UNICODE
+#    define  wxAtof    atof
+#  endif
+#  define  wxAtoi      _ttoi
+#  define  wxAtol      _ttol
+#  define  wxGetenv    _tgetenv
+#  define  wxSystem    _tsystem
+#endif // wxNO_TCHAR_STDLIB

 
    // time.h functions
 
    // 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__)
+#ifndef wxNO_TCHAR_TIME
+#  define  wxAsctime   _tasctime
+#  define  wxCtime     _tctime
+#endif // wxNO_TCHAR_TIME

 
 

-// 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
-#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
+#else // !TCHAR-aware compilers

 
 // check whether we should include wchar.h or equivalent
 
 // 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 <wcstr.h>
- #else
-  #ifndef __FreeBSD__
-   #include <wchar.h>
-  #else
-   #include <stdlib.h>
-   #define wxNEED_WCSLEN
-  #endif
- #endif
-#endif
+#  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__) || 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(__BORLANDC__) // WIN16 BC++
+#      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)
+
+#   if wxUSE_WCHAR_T
+#       ifdef HAVE_WCHAR_H
+            // include wchar.h to get wcslen() declaration used by wx/buffer.h
+            // stddef.h is needed for Cygwin
+#           include <stddef.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

 
 // check whether we are doing Unicode
 
 // check whether we are doing Unicode

-#if wxUSE_UNICODE
+#  if wxUSE_UNICODE

 
 

-#include <wctype.h>
+#    include <wctype.h>

 
 // this is probably glibc-specific
 
 // 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;
 
 
 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
+
+#      define  wxFgetc     fgetwc
+#      define  wxFgetchar  fgetwchar
+#      define  wxFgets     fgetws
+#      define  wxFputc     fputwc
+#      define  wxFputchar  fputwchar
+#      define  wxFprintf   fwprintf
+#      define  wxFscanf    fwscanf
+#      define  wxGetc      getwc
+#      define  wxGetchar   getwchar
+#      define  wxGets      getws
+#      define  wxPrintf    wprintf
+#      define  wxPutc      wputc
+#      define  wxPutchar   wputchar
+#      define  wxPuts      putws
+#      define  wxScanf     wscanf
+#      define  wxSnprintf  swprintf
+#      define  wxSscanf    swscanf
+#      define  wxUngetc    ungetwc
+#      define  wxVfprint   vfwprintf
+#      define  wxVprintf   vwprintf
+#      define  wxVsscanf   vswscanf
+#      define  wxVsnprintf vswprintf

 
 // glibc doesn't have wc equivalents of the other stuff
 
 // 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 __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
+#      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>
+
+    typedef char            wxChar;
+    typedef signed char     wxSChar;
+    typedef unsigned char   wxUChar;
+
+#   if defined(__FreeBSD__) || defined(__DARWIN__)
+#     undef _T
+#   endif
+
+#   if !defined(__MINGW32__) || !defined(_T)
+#     define _T(x)           x
+#   endif
+
+     // 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!!
+
+    #ifdef HAVE_STRTOK_R
+        #define  wxStrtok(str, sep, last)    strtok_r(str, sep, last)
+    #else
+        #define  wxStrtok(str, sep, last)    strtok(str, sep)
+    #endif
+
+     // 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
 #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__) || 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
+#  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
 #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
+#if !defined(__MWERKS__) || !defined(__WXMAC__)
+#    define  wxStrdup    strdup
+#endif
+#    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  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  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
 
 #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; }
+// 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
 
 #ifndef wxNEED_WX_STRING_H

-/// safe version of strlen() (returns 0 if passed NULL pointer)
-inline size_t WXDLLEXPORT 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
 
 #if wxUSE_WCHAR_T
 // multibyte<->widechar conversion
    { return psz ? wxStrlen_(psz) : 0; }
 #endif
 
 #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
-#else
-#define wxMB2WX wxStrncpy
-#define wxWX2MB wxStrncpy
-#define wxWC2WX wxWC2MB
-#define wxWX2WC wxMB2WC
-#endif
+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
 // No wxUSE_WCHAR_T: we have to do something (JACS)
 #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
 
 #endif
 

-bool WXDLLEXPORT wxOKlibc(); // for internal use
+WXDLLEXPORT bool wxOKlibc(); // for internal use

 
 // if libc versions are not available, use replacements defined in wxchar.cpp
 #ifndef wxStrdup
 
 // 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
 #endif
 
 #ifndef wxStricmp

-int      WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2);
+WXDLLEXPORT int      wxStricmp(const wxChar *psz1, const wxChar *psz2);

 #endif
 
 #endif
 

-#ifndef wxStrtok
-wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
+#ifndef wxStrnicmp
+WXDLLEXPORT int      wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t len);

 #endif
 
 #endif
 

-#ifndef wxSetlocale
-wxChar * WXDLLEXPORT wxSetlocale(int category, const wxChar *locale);
+#ifndef wxStrtok
+WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);

 #endif
 
 #endif
 

-#ifdef wxNEED_WCSLEN // for use in buffer.h
-size_t   WXDLLEXPORT wcslen(const wchar_t *s);
+#ifndef wxSetlocale
+class wxWCharBuffer;
+WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale);

 #endif
 
 #ifdef wxNEED_WX_CTYPE_H
 #endif
 
 #ifdef wxNEED_WX_CTYPE_H

-int WXDLLEXPORT wxIsalnum(wxChar ch);
-int WXDLLEXPORT wxIsalpha(wxChar ch);
-int WXDLLEXPORT wxIsctrl(wxChar ch);
-int WXDLLEXPORT wxIsdigit(wxChar ch);
-int WXDLLEXPORT wxIsgraph(wxChar ch);
-int WXDLLEXPORT wxIslower(wxChar ch);
-int WXDLLEXPORT wxIsprint(wxChar ch);
-int WXDLLEXPORT wxIspunct(wxChar ch);
-int WXDLLEXPORT wxIsspace(wxChar ch);
-int WXDLLEXPORT wxIsupper(wxChar ch);
-int WXDLLEXPORT wxIsxdigit(wxChar ch);
-int WXDLLEXPORT wxTolower(wxChar ch);
-int WXDLLEXPORT wxToupper(wxChar ch);
+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
 #endif
 
 #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);
+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
 
 #ifdef wxNEED_WX_STDIO_H
 #endif
 
 #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);
+#  include <stdio.h>
+#  include <stdarg.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);

 #endif
 
 #ifndef wxAtof
 #endif
 
 #ifndef wxAtof

-double   WXDLLEXPORT wxAtof(const wxChar *psz);
+WXDLLEXPORT double   wxAtof(const wxChar *psz);

 #endif
 
 #ifdef wxNEED_WX_STDLIB_H
 #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
+
+#ifdef wxNEED_WX_TIME_H
+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
+#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
 
 #endif
   //_WX_WXCHAR_H_
 #endif
 
 #endif
   //_WX_WXCHAR_H_

+