attempted Unicode fixes for BC++

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 48c1fd1c60f10430eff0769b3f88e59f4e1edef3..53ff323588dc04a33dc09b31cfb65d8ba81b6b8f 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,9 +12,9 @@
 #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 )


@@ -41,12 +41,33 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

-// Windows (VC++) has broad TCHAR support
-#if defined(__VISUALC__) && defined(__WIN32__)
+// ----------------------------------------------------------------------------
+// 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
+    #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
+#endif

 
 

+#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
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 #  if wxUSE_UNICODE // temporary - preserve binary compatibility
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;


@@ -61,6 +82,7 @@ typedef  _TUCHAR     wxUChar;
 #  define wxUSE_WCHAR_T 1
 
    // ctype.h functions
 #  define wxUSE_WCHAR_T 1
 
    // ctype.h functions

+#ifndef wxNO_TCHAR_CTYPE

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


@@ -74,11 +96,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


@@ -96,12 +122,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,55 +157,44 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxVprintf   _vtprintf
 #  define  wxVsscanf   _vstscanf
 #  define  wxVsprintf  _vstprintf
 #  define  wxVprintf   _vtprintf
 #  define  wxVsscanf   _vstscanf
 #  define  wxVsprintf  _vstprintf

+#elif defined(__VISAGECPP__)
+    // 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
 #  if wxUSE_UNICODE
 
 // check whether we should include wchar.h or equivalent
 #  if wxUSE_UNICODE


@@ -289,50 +305,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
+#   ifdef __FreeBSD__
+#     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 +364,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

-#  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS) && defined(__INTEL__))
+#    define wxStrnicmp strnicmp
+#  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))

 #    define wxStricmp _stricmp
 #    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,11 +459,11 @@ 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
+// checks whether the passed in pointer is NULL and if the string is empty

 WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
 
 #ifndef wxNEED_WX_STRING_H
 WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
 
 #ifndef wxNEED_WX_STRING_H

-/// safe version of strlen() (returns 0 if passed NULL pointer)
+// safe version of strlen() (returns 0 if passed NULL pointer)

 WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
    { return psz ? wxStrlen_(psz) : 0; }
 #endif
 WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
    { return psz ? wxStrlen_(psz) : 0; }
 #endif


@@ -483,7 +509,7 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 #endif
 
 #ifndef wxSetlocale
 #endif
 
 #ifndef wxSetlocale

-WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale);
+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


@@ -557,6 +583,17 @@ 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
 

+// 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_