Applied patch from SF on menu command not blocked

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index c185288ce6be8a45894ca5153a82b6c98a1c2e53..c4742c529f671111a46f955955e5bb1dd7151d95 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -68,6 +68,9 @@
         #include <stddef.h>
         #include <string.h>
         #include <ctype.h>
+    #elif defined(__CYGWIN__)
+        #include <stddef.h>
+        #include <wchar.h>
     #endif
 #elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
     // VisualAge 4.0+ supports TCHAR
@@ -270,7 +273,7 @@ typedef  _TUCHAR     wxUChar;
 #    if defined(__VISUALC__) && (__VISUALC__ < 900)
 #      define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
 #    elif defined(__UNIX__)
-#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__DARWIN__))
+#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__)
 #        define wxUSE_WCHAR_T 1
 #      else
 #        define wxUSE_WCHAR_T 0
@@ -293,12 +296,17 @@ typedef  _TUCHAR     wxUChar;
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else
-       // VZ: do we really have to include this?
-#      include <stdlib.h>
-
-       // include wchar.h to get wcslen() declaration used by wx/buffer.h
 #      if defined(HAVE_WCHAR_H)
+
+// include wchar.h to get wcslen() declaration used by wx/buffer.h
 #        include <wchar.h>
+
+#      elif defined(__FreeBSD__) || defined(__DARWIN__)
+
+// include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp
+#        include <stdlib.h>
+size_t   WXDLLEXPORT wcslen(const wchar_t *s);
+
 #      endif
 #    endif
 #  endif