Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index c0658eaf9711a3ff4815f07cd3deb642a34681d4..b2c3342500e1c2ea41d7b6359129bfbc06cdfa5c 100644 (file)
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -48,16 +48,11 @@
 
    Actually MinGW has tchar.h, but it does not include wchar.h
  */
-#if defined(__MWERKS__) || defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
+#if defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
     #ifndef HAVE_WCHAR_H
         #define HAVE_WCHAR_H
     #endif
 #endif
-#if defined(__MWERKS__) && !defined(__MACH__)
-    #ifndef HAVE_WCSLEN
-        #define HAVE_WCSLEN
-    #endif
-#endif
 
 #ifdef HAVE_WCHAR_H
     /* the current (as of Nov 2002) version of cygwin has a bug in its */
@@ -105,8 +100,6 @@
     #define wxHAVE_TCHAR_SUPPORT
 #elif defined(__DMC__)
     #define wxHAVE_TCHAR_SUPPORT
-#elif defined(__WXPALMOS__)
-    #include <stddef.h>
 #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
     #define wxHAVE_TCHAR_SUPPORT
     #include <stddef.h>
@@ -250,6 +243,12 @@
     #endif /* ASCII/Unicode */
 #endif /* !defined(wxT) */
 
+/*
+    wxT_2 exists only for compatibility with wx 2.x and is the same as wxT() in
+    that version but nothing in the newer ones.
+ */
+#define wxT_2(x) x
+
 /*
    wxS ("wx string") macro can be used to create literals using the same
    representation as wxString does internally, i.e. wchar_t in Unicode build