Window management and sizer layout corrections

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 7d49daf7c0d045370a15291273274921b43695a6..462da579d693fa6f274d85ad7f92216eb8960cfa 100644 (file)
--- 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
@@ -201,6 +202,13 @@ typedef  _TUCHAR     wxUChar;
 
    // stdio.h functions
 #ifndef wxNO_TCHAR_STDIO
+#  if wxUSE_UNICODE_MSLU
+#    define  wxRemove    wxMSLU__tremove
+#    define  wxRename    wxMSLU__trename
+#  else
+#    define  wxRemove    _tremove
+#    define  wxRename    _trename
+#  endif
 #  define  wxFgetc     _fgettc
 #  define  wxFgetchar  _fgettchar
 #  define  wxFgets     _fgetts
@@ -218,8 +226,6 @@ typedef  _TUCHAR     wxUChar;
 #  define  wxPutc      _puttc
 #  define  wxPutchar   _puttchar
 #  define  wxPuts      _putts
-#  define  wxRemove    _tremove
-#  define  wxRename    _trename
 #  define  wxScanf     _tscanf
 #  define  wxSprintf   _stprintf
 #  define  wxSscanf    _stscanf
@@ -301,7 +307,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>
@@ -466,7 +472,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 +682,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_