Small modifications to Vadims changes

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index c7a3dbdc6f2de65b564a5f5976196482854b70c1..96db64a2244ee4d2a08cb365ec9b44168cf7619e 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -186,7 +186,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)
+  #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__)
    #define wxUSE_WCHAR_T 1
   #else
    #define wxUSE_WCHAR_T 0
@@ -200,11 +200,16 @@ typedef  _TUCHAR     wxUChar;
 #endif//wxUSE_UNICODE
 
 #if wxUSE_WCHAR_T
-#ifdef HAVE_WCSTR_H
-#include <wcstr.h>
-#else
-#include <wchar.h>
-#endif
+ #ifdef HAVE_WCSTR_H
+  #include <wcstr.h>
+ #else
+  #ifndef __FreeBSD__
+   #include <wchar.h>
+  #else
+   #include <stdlib.h>
+   #define wxNEED_WCSLEN
+  #endif
+ #endif
 #endif
 
 // check whether we are doing Unicode
@@ -288,6 +293,9 @@ typedef unsigned char   wxUChar;
 #define wxUChar unsigned char
 #endif
 
+#ifdef __FreeBSD__
+ #undef _T
+#endif
 #define _T(x)           x
 
    // ctype.h functions
@@ -441,7 +449,16 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *psz, size_t n);
 #define wxWC2WX wxWC2MB
 #define wxWX2WC wxMB2WC
 #endif
+#else
+// No wxUSE_WCHAR_T: we have to do something (JACS)
+#define wxMB2WC wxStrncpy
+#define wxWC2MB wxStrncpy
+#define wxMB2WX wxStrncpy
+#define wxWX2MB wxStrncpy
+#define wxWC2WX wxWC2MB
+#define wxWX2WC wxMB2WC
 #endif
+
 bool WXDLLEXPORT wxOKlibc(); // for internal use
 
 // if libc versions are not available, use replacements defined in wxchar.cpp