1. wxFileDialog patch for multiple selection applied (with some small changes),

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 2b6ba272fbe5cf72d274b8ae07735787d34717dd..bd91e9bb059ce084b56cc3a9b3ff2bacece5331b 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -169,15 +169,130 @@ typedef  _TUCHAR     wxUChar;
 #  endif
    // wchar_t is available
 #  undef wxUSE_WCHAR_T
 #  endif
    // wchar_t is available
 #  undef wxUSE_WCHAR_T

+// This test is for C++Builder
+#if __BORLANDC__ >= 0x530
+#  define wxUSE_WCHAR_T 0
+#else

 #  define wxUSE_WCHAR_T 1
 #  define wxUSE_WCHAR_T 1

-
+#  define wxNEED_WCSLEN
+#endif

 #  define wxNEED_WX_CTYPE_H
 // #define  wxStrtok    strtok_r // Borland C++ 4.52 doesn't have strtok_r
 #  define wxNEED_WX_STRING_H
 #  define wxNEED_WX_STDIO_H
 #  define wxNEED_WX_STDLIB_H
 #  define wxNEED_WX_TIME_H
 #  define wxNEED_WX_CTYPE_H
 // #define  wxStrtok    strtok_r // Borland C++ 4.52 doesn't have strtok_r
 #  define wxNEED_WX_STRING_H
 #  define wxNEED_WX_STDIO_H
 #  define wxNEED_WX_STDLIB_H
 #  define wxNEED_WX_TIME_H

-#  define wxNEED_WCSLEN
+
+// VisualAge C++ V4.0 has broad tchar support
+#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
+
+#  define HAVE_WCSLEN 1
+#  include <wchar.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
+#  endif
+   // wchar_t is available
+#  undef wxUSE_WCHAR_T
+#  define wxUSE_WCHAR_T 1
+
+   // ctype.h functions
+#  define  wxIsalnum   _istalnum
+#  define  wxIsalpha   _istalpha
+#  define  wxIsctrl    _istcntrl
+#  define  wxIsdigit   _istdigit
+#  define  wxIsgraph   _istgraph
+#  define  wxIslower   _istlower
+#  define  wxIsprint   _istprint
+#  define  wxIspunct   _istpunct
+#  define  wxIsspace   _istspace
+#  define  wxIsupper   _istupper
+#  define  wxIsxdigit  _istxdigit
+#  define  wxTolower   _totlower
+#  define  wxToupper   _totupper
+
+   // locale.h functons -- not defined in tchar.h
+#  define  wxSetlocale setlocale
+
+   // 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  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
+// not defined in tchar.h
+#  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.h functions -- none defined in tchar.h
+#  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(XXX)
+   // #include XXX-specific files here
+   // typeddef YYY wxChar;
+
+   // translate wxZZZ names

 
 #else//!TCHAR-aware compilers
 
 
 #else//!TCHAR-aware compilers
 


@@ -349,10 +464,13 @@ typedef unsigned __WCHAR_TYPE__ 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