Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index f764e67eb7856f5343dc9da207be15e7371a4727..ffe6190badfddd6df65236dfdf9d1189d28f8c16 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -47,6 +47,7 @@
 #  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;


@@ -168,15 +169,19 @@ 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
+#elif

 #  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

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


@@ -289,50 +294,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 +353,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


@@ -557,6 +572,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_