X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd362275b853cc0308bbde6a60bb2525d659f709..8e7a3ecb9c1b9f5653e56301f51dfa39acca6bc6:/include/wx/chartype.h

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index a0c527ba26..fbc307deb0 100644
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -4,7 +4,6 @@
  * Author:      Joel Farley, Ove KÃ¥ven
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
- * RCS-ID:      $Id$
  * Copyright:   (c) 1998-2006 wxWidgets dev team
  * Licence:     wxWindows licence
  */
@@ -48,16 +47,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 */
@@ -96,7 +90,7 @@
 /* -------------------------------------------------------------------------- */
 
 /* VC++ and BC++ starting with 5.2 have TCHAR support */
-#ifdef __VISUALC__
+#if defined(__VISUALC__) || (defined(__WINDOWS__) && defined(__INTELC__))
     #define wxHAVE_TCHAR_SUPPORT
 #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
     #define wxHAVE_TCHAR_SUPPORT