#ifdefed wxPopupComboWindow to be used only in wxUniv

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index f764e67eb7856f5343dc9da207be15e7371a4727..26ce087d2e3d04c02b8f8def262f3bf408c1320b 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,15 +12,20 @@
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 
 #ifndef _WX_WXCHAR_H_
 #define _WX_WXCHAR_H_
 

-//#ifdef __GNUG__
-//#pragma interface "wxchar.h"
-//#endif
+#ifdef __GNUG__
+    #pragma interface "wxchar.h"
+#endif

 
 // only do SBCS or _UNICODE
 #if defined (_MBCS )
 
 // 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)
 #  undef wxUSE_UNICODE
 // set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined
 #if defined(_UNICODE) || defined(UNICODE)
 #  undef wxUSE_UNICODE


@@ -29,7 +34,7 @@
 #  ifndef wxUSE_UNICODE
 #    define wxUSE_UNICODE 0
 #  endif
 #  ifndef wxUSE_UNICODE
 #    define wxUSE_UNICODE 0
 #  endif

-#endif
+#endif // Unicode

 
 // and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1...
 #if wxUSE_UNICODE
 
 // and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1...
 #if wxUSE_UNICODE


@@ -39,15 +44,90 @@
 #  ifndef UNICODE
 #    define UNICODE
 #  endif
 #  ifndef UNICODE
 #    define UNICODE
 #  endif

-#endif
-
-// Windows (VC++) has broad TCHAR support
-#if defined(__VISUALC__) && defined(__WIN32__)
+#endif // Unicode

 
 

+// Unicode support requires wchar_t
+#if wxUSE_UNICODE
+#   undef wxUSE_WCHAR_T
+#   define wxUSE_WCHAR_T 1
+#endif // Unicode
+
+// ----------------------------------------------------------------------------
+// define wxHAVE_TCHAR_FUNCTIONS for the compilers which support the
+// wide-character functions
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+    // VC++ and BC++ starting with 5.2 have TCHAR support
+    #ifdef __VISUALC__
+        #define wxHAVE_TCHAR_FUNCTIONS
+    #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
+        #define wxHAVE_TCHAR_FUNCTIONS
+    // w32api isn't yet tchar safe, will be soon, this is a placeholder
+    #elif defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 10, 0 )
+        #define wxHAVE_TCHAR_FUNCTIONS
+        #include <stddef.h>
+        #include <string.h>
+        #include <ctype.h>
+    #endif
+#elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+    // VisualAge 4.0+ supports TCHAR
+    #define wxHAVE_TCHAR_FUNCTIONS
+
+    // but not stdio.h nor time nor conversion functions
+    #define wxNO_TCHAR_STDIO
+    #define wxNO_TCHAR_STDLIB
+    #define wxNO_TCHAR_TIME
+    #define wxNO_TCHAR_LOCALE
+    //
+    // supplemental VA V4 defs so at least we know what these are
+    // just define to standard defs
+    //
+
+    // for wcslen
+    #include <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
+#endif // compilers with (good) TCHAR support
+
+#ifdef wxHAVE_TCHAR_FUNCTIONS

 #  define HAVE_WCSLEN 1
 
 #  include <tchar.h>
 #  define HAVE_WCSLEN 1
 
 #  include <tchar.h>

+

 #  if wxUSE_UNICODE // temporary - preserve binary compatibility
 #  if wxUSE_UNICODE // temporary - preserve binary compatibility

+#if defined(__GNUWIN32__)
+    #define _TCHAR   TCHAR
+    #define _TSCHAR  TCHAR
+    #define _TUCHAR  TCHAR
+#endif
+

 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 typedef  _TUCHAR     wxUChar;
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 typedef  _TUCHAR     wxUChar;


@@ -56,11 +136,17 @@ typedef  _TUCHAR     wxUChar;
 #    define wxSChar signed char
 #    define wxUChar unsigned char
 #  endif
 #    define wxSChar signed char
 #    define wxUChar unsigned char
 #  endif

-   // wchar_t is available
-#  undef wxUSE_WCHAR_T
-#  define wxUSE_WCHAR_T 1
+
+    // wchar_t is available
+    #ifndef wxUSE_WCHAR_T
+        #define wxUSE_WCHAR_T 1
+    #endif // !defined(wxUSE_WCHAR_T)

 
    // ctype.h functions
 
    // ctype.h functions

+#ifndef wxNO_TCHAR_CTYPE
+#ifdef __BORLANDC__
+#  include <ctype.h>
+#endif

 #  define  wxIsalnum   _istalnum
 #  define  wxIsalpha   _istalpha
 #  define  wxIsctrl    _istctrl
 #  define  wxIsalnum   _istalnum
 #  define  wxIsalpha   _istalpha
 #  define  wxIsctrl    _istctrl


@@ -74,11 +160,15 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxIsxdigit  _istxdigit
 #  define  wxTolower   _totlower
 #  define  wxToupper   _totupper
 #  define  wxIsxdigit  _istxdigit
 #  define  wxTolower   _totlower
 #  define  wxToupper   _totupper

+#endif // wxNO_TCHAR_CTYPE

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

+#ifndef wxNO_TCHAR_LOCALE

 #  define  wxSetlocale _tsetlocale
 #  define  wxSetlocale _tsetlocale

+#endif // wxNO_TCHAR_LOCALE

 
    // string.h functions
 
    // string.h functions

+#ifndef wxNO_TCHAR_STRING

 #  define  wxStrcat    _tcscat
 #  define  wxStrchr    _tcschr
 #  define  wxStrcmp    _tcscmp
 #  define  wxStrcat    _tcscat
 #  define  wxStrchr    _tcschr
 #  define  wxStrcmp    _tcscmp


@@ -87,6 +177,7 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxStrcspn   _tcscspn
 #  define  wxStrftime  _tcsftime
 #  define  wxStricmp   _tcsicmp
 #  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  wxStrlen_   _tcslen // used in wxStrlen inline function
 #  define  wxStrncat   _tcsncat
 #  define  wxStrncmp   _tcsncmp


@@ -96,12 +187,13 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxStrspn    _tcsspn
 #  define  wxStrstr    _tcsstr
 #  define  wxStrtod    _tcstod
 #  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

+#endif // wxNO_TCHAR_STRING

 
    // stdio.h functions
 
    // stdio.h functions

+#ifndef wxNO_TCHAR_STDIO

 #  define  wxFgetc     _fgettc
 #  define  wxFgetchar  _fgettchar
 #  define  wxFgets     _fgetts
 #  define  wxFgetc     _fgettc
 #  define  wxFgetchar  _fgettchar
 #  define  wxFgets     _fgetts


@@ -130,65 +222,51 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxVprintf   _vtprintf
 #  define  wxVsscanf   _vstscanf
 #  define  wxVsprintf  _vstprintf
 #  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

+#ifndef wxNO_TCHAR_STDLIB

 #  if !wxUSE_UNICODE
 #  if !wxUSE_UNICODE

-#    define  wxAtof      atof
+#    define  wxAtof    atof

 #  endif
 #  define  wxAtoi      _ttoi
 #  define  wxAtol      _ttol
 #  define  wxGetenv    _tgetenv
 #  define  wxSystem    _tsystem
 #  endif
 #  define  wxAtoi      _ttoi
 #  define  wxAtol      _ttol
 #  define  wxGetenv    _tgetenv
 #  define  wxSystem    _tsystem

+#endif // wxNO_TCHAR_STDLIB

 
    // time.h functions
 
    // time.h functions

+#ifndef wxNO_TCHAR_TIME

 #  define  wxAsctime   _tasctime
 #  define  wxCtime     _tctime
 #  define  wxAsctime   _tasctime
 #  define  wxCtime     _tctime

+#endif // wxNO_TCHAR_TIME

 
 

-// #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
-#  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(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(__VISUALC__) && (__VISUALC__ < 900)
 #      define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
 #    elif defined(__UNIX__)

-#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__)
+#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))

 #        define wxUSE_WCHAR_T 1
 #      else
 #        define wxUSE_WCHAR_T 0
 #        define wxUSE_WCHAR_T 1
 #      else
 #        define wxUSE_WCHAR_T 0


@@ -199,21 +277,23 @@ typedef  _TUCHAR     wxUChar;
 #      define wxUSE_WCHAR_T 0
 #    elif defined(__WATCOMC__)
 #      define wxUSE_WCHAR_T 0
 #      define wxUSE_WCHAR_T 0
 #    elif defined(__WATCOMC__)
 #      define wxUSE_WCHAR_T 0

+#    elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+#      define wxUSE_WCHAR_T 1

 #    else
   // add additional compiler checks if this fails
 #      define wxUSE_WCHAR_T 1
 #    endif
 #    else
   // add additional compiler checks if this fails
 #      define wxUSE_WCHAR_T 1
 #    endif

-#  endif//wxUSE_UNICODE
+#  endif // !defined(wxUSE_WCHAR_T)

 
 #  if wxUSE_WCHAR_T
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else
 
 #  if wxUSE_WCHAR_T
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else

-#      ifndef __FreeBSD__
-#        include <wchar.h>
-#      else
+#      if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))

 #        include <stdlib.h>
 #        define wxNEED_WCSLEN
 #        include <stdlib.h>
 #        define wxNEED_WCSLEN

+#      else
+#        include <wchar.h>

 #      endif
 #    endif
 #  endif
 #      endif
 #    endif
 #  endif


@@ -289,50 +369,57 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #    include <ctype.h>
 #    include <string.h>
 
 #    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
+#   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
+#   if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
+#     undef _T
+#   endif
+
+#   if !defined(__MINGW32__) || !defined(_T)
+#     define _T(x)           x
+#   endif

 
      // ctype.h functions
 
      // 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
+#   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
 
      // 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
+#   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
 
 #  endif//Unicode
 #endif//TCHAR-aware compilers


@@ -341,10 +428,13 @@ typedef unsigned char   wxUChar;
 #if !defined(wxStricmp) && !wxUSE_UNICODE
 #  if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__)
 #    define wxStricmp stricmp
 #if !defined(wxStricmp) && !wxUSE_UNICODE
 #  if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__)
 #    define wxStricmp stricmp

+#    define wxStrnicmp strnicmp

 #  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
 #    define wxStricmp _stricmp
 #  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
 #    define wxStricmp _stricmp

+#    define wxStrnicmp _strnicmp

 #  elif defined(__UNIX__) || defined(__GNUWIN32__)
 #    define wxStricmp strcasecmp
 #  elif defined(__UNIX__) || defined(__GNUWIN32__)
 #    define wxStricmp strcasecmp

+#    define wxStrnicmp strncasecmp

 #  elif defined(__MWERKS__) && !defined(__INTEL__)
      // use wxWindows' implementation
 #  else
 #  elif defined(__MWERKS__) && !defined(__INTEL__)
      // use wxWindows' implementation
 #  else


@@ -433,12 +523,12 @@ typedef unsigned char   wxUChar;
 #  undef wxNEED_WCSLEN
 #endif
 
 #  undef wxNEED_WCSLEN
 #endif
 

-/// checks whether the passed in pointer is NULL and if the string is empty
-WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
+// checks whether the passed in pointer is NULL and if the string is empty
+inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }

 
 #ifndef wxNEED_WX_STRING_H
 
 #ifndef wxNEED_WX_STRING_H

-/// safe version of strlen() (returns 0 if passed NULL pointer)
-WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
+// safe version of strlen() (returns 0 if passed NULL pointer)
+inline size_t wxStrlen(const wxChar *psz)

    { return psz ? wxStrlen_(psz) : 0; }
 #endif
 
    { return psz ? wxStrlen_(psz) : 0; }
 #endif
 


@@ -478,12 +568,17 @@ WXDLLEXPORT wxChar * wxStrdup(const wxChar *psz);
 WXDLLEXPORT int      wxStricmp(const wxChar *psz1, const wxChar *psz2);
 #endif
 
 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
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
 #endif
 
 #ifndef wxSetlocale
 #ifndef wxStrtok
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
 #endif
 
 #ifndef wxSetlocale

-WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale);
+class wxWCharBuffer;
+WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale);

 #endif
 
 #ifdef wxNEED_WCSLEN // for use in buffer.h
 #endif
 
 #ifdef wxNEED_WCSLEN // for use in buffer.h


@@ -532,6 +627,8 @@ WXDLLEXPORT size_t   wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
 #  include <stdarg.h>
 WXDLLEXPORT FILE *   wxFopen(const wxChar *path, const wxChar *mode);
 WXDLLEXPORT FILE *   wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
 #  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);

 WXDLLEXPORT int      wxPrintf(const wxChar *fmt, ...);
 WXDLLEXPORT int      wxVprintf(const wxChar *fmt, va_list argptr);
 WXDLLEXPORT int      wxFprintf(FILE *stream, const wxChar *fmt, ...);
 WXDLLEXPORT int      wxPrintf(const wxChar *fmt, ...);
 WXDLLEXPORT int      wxVprintf(const wxChar *fmt, va_list argptr);
 WXDLLEXPORT int      wxFprintf(FILE *stream, const wxChar *fmt, ...);


@@ -557,6 +654,28 @@ WXDLLEXPORT int      wxSystem(const wxChar *psz);
 WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm);
 #endif
 
 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)
+
+// a Unicode-friendly __FILE__ analog
+#ifndef __TFILE__
+    #define __XFILE__(x) wxT(x)
+    #define __TFILE__ __XFILE__(__FILE__)
+#endif
+

 #endif
   //_WX_WXCHAR_H_
 
 #endif
   //_WX_WXCHAR_H_