X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49828363f8186e48468606143820b02b4dbc8a43..8506d95db494b020068bf2a7a69763b0f2b661b5:/include/wx/wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 42eb1a76be..a26fcb502c 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -12,9 +12,9 @@
 #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 )
@@ -195,6 +195,10 @@ typedef  _TUCHAR     wxUChar;
   #endif
  #elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h
   #define wxUSE_WCHAR_T 0
+ #elif defined(__BORLANDC__) // WIN16 BC++
+  #define wxUSE_WCHAR_T 0
+ #elif defined(__WATCOMC__)
+  #define wxUSE_WCHAR_T 0
  #else
   // add additional compiler checks if this fails
   #define wxUSE_WCHAR_T 1
@@ -319,7 +323,9 @@ typedef unsigned char   wxUChar;
 #define  wxSetlocale setlocale
 
    // string.h functions
-#define  wxStricmp   strcasecmp
+// #define  wxStricmp   strcasecmp
+// wxStricmp is defined below!!
+
 // #define  wxStrtok    strtok_r // this needs a configure check
 
    // leave the rest to defaults below