More fixes to make Borland compile this in Unicode mode.

[wxWidgets.git] / src / common / wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index a8cde061fb7f9f7812a3a682cd173f78dfe23123..f985d439d1999d146739dd513cff8c678d650ce8 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -39,9 +39,14 @@
   #include "wx/hash.h"
 #endif
 
   #include "wx/hash.h"
 #endif
 

+#if wxUSE_WCHAR_T

 size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   if (buf) {
 size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   if (buf) {

+    if (!n || !*psz) {
+      if (n) *buf = _T('\0');
+      return 0;
+    }

     return mbstowcs(buf, psz, n);
   }
 
     return mbstowcs(buf, psz, n);
   }
 


@@ -60,6 +65,11 @@ size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 {
   if (buf) {
 size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 {
   if (buf) {

+    if (!n || !*pwz) {
+      // glibc2.1 chokes on null input
+      if (n) *buf = '\0';
+      return 0;
+    }

     return wcstombs(buf, pwz, n);
   }
 
     return wcstombs(buf, pwz, n);
   }
 


@@ -74,6 +84,7 @@ size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
   return wcstombs((char *) NULL, pwz, 0);
 #endif // GNU
 }
   return wcstombs((char *) NULL, pwz, 0);
 #endif // GNU
 }

+#endif

 
 #ifndef wxStrdup
 wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
 
 #ifndef wxStrdup
 wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)


@@ -85,6 +96,18 @@ wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
 }
 #endif
 
 }
 #endif
 

+#ifndef wxStricmp
+int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
+{
+  register wxChar c1, c2;
+  do {
+    c1 = wxTolower(*psz1++);
+    c2 = wxTolower(*psz2++);
+  } while ( c1 && (c1 == c2) );
+  return c1 - c2;
+}
+#endif
+

 #ifndef wxStrtok
 wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
 #ifndef wxStrtok
 wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {