Fix typo in last commit

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

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 05909433d299a602858e6722bd99c832f3fb8f75..dc51b48e41a7c00179e417ae63bf5bd8c9954dad 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -29,6 +29,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
+
+#ifdef __SGI__
+    // wide character functions are declared in std namespace under IRIX
+    using namespace std;
+
+    // and this one is only declared if __c99 is defined which is not the case
+    // for C++ builds, so declare it ourselves
+    extern "C" int vswscanf(const wchar_t *, const wchar_t *, va_list);
+#endif
 
 #ifndef __WXPALMOS5__
 #ifndef __WXWINCE__
@@ -71,7 +81,6 @@ using namespace std ;
     #include <xlocale.h>
 #endif
 
-#if wxUSE_WCHAR_T
 WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   // assume that we have mbsrtowcs() too if we have wcsrtombs()
@@ -131,7 +140,6 @@ WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
   return wxWcstombs(NULL, pwz, 0);
 #endif
 }
-#endif // wxUSE_WCHAR_T
 
 char* wxSetlocale(int category, const char *locale)
 {
@@ -578,13 +586,20 @@ namespace
 #if !wxUSE_UTF8_LOCALE_ONLY
 int ConvertStringToBuf(const wxString& s, char *out, size_t outsize)
 {
-    const wxWX2WCbuf buf = s.wc_str();
+    const wxCharBuffer buf(s.mb_str());
 
-    size_t len = wxConvLibc.FromWChar(out, outsize, buf);
-    if ( len != wxCONV_FAILED )
-        return len-1;
-    else
-        return wxConvLibc.FromWChar(NULL, 0, buf);
+    const size_t len = buf.length();
+    if ( outsize > len )
+    {
+        memcpy(out, buf, (len+1) * sizeof(char));
+    }
+    else // not enough space
+    {
+        memcpy(out, buf, (outsize-1) * sizeof(char));
+        out[outsize-1] = '\0';
+    }
+
+    return len;
 }
 #endif // !wxUSE_UTF8_LOCALE_ONLY
 
@@ -725,7 +740,6 @@ int wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argpt
 }
 #endif // wxUSE_UNICODE
 
-#if wxUSE_WCHAR_T
 
 // ----------------------------------------------------------------------------
 // ctype.h stuff (currently unused)
@@ -943,8 +957,6 @@ wxCRT_StrftimeW(wchar_t *s, size_t maxsize, const wchar_t *fmt, const struct tm
 }
 #endif // !wxCRT_StrftimeW
 
-#endif // wxUSE_WCHAR_T
-
 #ifdef wxLongLong_t
 template<typename T>
 static wxULongLong_t
@@ -1099,7 +1111,7 @@ wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base)
 #endif // wxLongLong_t
 
 // ----------------------------------------------------------------------------
-// functions which we may need even if !wxUSE_WCHAR_T
+// strtok() functions
 // ----------------------------------------------------------------------------
 
 template<typename T>
@@ -1246,9 +1258,11 @@ void wxUpdateLocaleIsUtf8()
 
 int wxPuts(const wxString& s)
 {
+    // under IRIX putws() takes a non-const argument so use wchar_str() instead
+    // of wc_str()
     CALL_ANSI_OR_UNICODE(return,
                          wxCRT_PutsA(s.mb_str()),
-                         wxCRT_PutsW(s.wc_str()));
+                         wxCRT_PutsW(s.wchar_str()));
 }
 
 int wxFputs(const wxString& s, FILE *stream)