X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbdb357ea2613f8aed6fdf3ae00223a29412d75f..ca5b5b49c81e2ffab063f2be6ada2ed4290d1db1:/include/wx/wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 072e4cdf28..df2130d45d 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -69,6 +69,7 @@
         #include <string.h>
         #include <ctype.h>
     #elif defined(__CYGWIN__)
+        #define HAVE_WCSLEN
         #include <stddef.h>
         #include <wchar.h>
     #endif
@@ -301,7 +302,7 @@ typedef  _TUCHAR     wxUChar;
 // include wchar.h to get wcslen() declaration used by wx/buffer.h
 #        include <wchar.h>
 
-#      elif defined(__FreeBSD__) || defined(__DARWIN__)
+#      elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
 
 // include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp
 #        include <stdlib.h>
@@ -439,7 +440,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 
 // define wxStricmp for various compilers without Unicode possibilities
 #if !defined(wxStricmp) && !wxUSE_UNICODE
-#  if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__)
+#  if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__) || defined(__DJGPP__)
 #    define wxStricmp stricmp
 #    define wxStrnicmp strnicmp
 #  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
@@ -466,7 +467,9 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #    define  wxStrcoll   strcoll
 #    define  wxStrcpy    strcpy
 #    define  wxStrcspn   strcspn
+#if !defined(__MWERKS__) || !defined(__WXMAC__)
 #    define  wxStrdup    strdup
+#endif
 #    define  wxStrlen_   strlen // used in wxStrlen inline function
 #    define  wxStrncat   strncat
 #    define  wxStrncmp   strncmp
@@ -674,12 +677,22 @@ WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const
 // and _() in wxWindows sources
 #define wxT(x)       _T(x)
 
-// a Unicode-friendly __FILE__ analog
+// Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs
 #ifndef __TFILE__
     #define __XFILE__(x) wxT(x)
     #define __TFILE__ __XFILE__(__FILE__)
 #endif
 
+#ifndef __TDATE__
+    #define __XDATE__(x) wxT(x)
+    #define __TDATE__ __XDATE__(__DATE__)
+#endif
+
+#ifndef __TTIME__
+    #define __XTIME__(x) wxT(x)
+    #define __TTIME__ __XTIME__(__TIME__)
+#endif
+
 #endif
   //_WX_WXCHAR_H_