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 1307daaf50d4243ae6dcf336f2f765a62e8185f1..f985d439d1999d146739dd513cff8c678d650ce8 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -24,6 +24,9 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#define _ISOC9X_SOURCE 1 // to get vsscanf()
+#define _BSD_SOURCE    1 // to still get strdup()
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -36,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);
   }
 


@@ -57,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);
   }
 


@@ -71,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)


@@ -82,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)
 {


@@ -137,12 +163,12 @@ int WXDLLEXPORT wxFprintf(FILE *stream, const wxChar *fmt, ...)
   int ret;
 
   va_start(argptr, fmt);
   int ret;
 
   va_start(argptr, fmt);

-  ret = wxFvprintf(stream, fmt, argptr);
+  ret = wxVfprintf(stream, fmt, argptr);

   va_end(argptr);
   return ret;
 }
 
   va_end(argptr);
   return ret;
 }
 

-int WXDLLEXPORT wxFvprintf(FILE *stream, const wxChar *fmt, va_list argptr)
+int WXDLLEXPORT wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr)

 {
   wxString str;
   str.PrintfV(fmt,argptr);
 {
   wxString str;
   str.PrintfV(fmt,argptr);


@@ -170,6 +196,26 @@ int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr)
   wxStrcpy(buf,str.c_str());
   return str.Len();
 }
   wxStrcpy(buf,str.c_str());
   return str.Len();
 }

+
+int WXDLLEXPORT wxSscanf(const wxChar *buf, const wxChar *fmt, ...)
+{
+  va_list argptr;
+  int ret;
+
+  va_start(argptr, fmt);
+  ret = wxVsscanf(buf, fmt, argptr);
+  va_end(argptr);
+  return ret;
+}
+
+int WXDLLEXPORT wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr)
+{
+  int ret;
+  // this will work only for numeric conversion! Strings will not be converted correctly
+  // hopefully this is all we'll need
+  ret = vsscanf(wxConv_libc.cWX2MB(buf), wxConv_libc.cWX2MB(fmt), argptr);
+  return ret;
+}

 #endif
 
 #ifndef wxAtof
 #endif
 
 #ifndef wxAtof