Uses wxUSE_WCHAR_T for compilers that don't support wchar_t.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9b9cc89f0f6bc4d570282b819726dd6536cb5ee3..2d371b9fa4893a67ab64d2d8f63d177a4dff5c16 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -2089,15 +2089,16 @@ size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
   ((wxCSConv *)this)->LoadNow(); // discard constness
   if (buf) {
     if (m_cset) {
   ((wxCSConv *)this)->LoadNow(); // discard constness
   if (buf) {
     if (m_cset) {

-      for (size_t c=0; c<=n; c++)
+      for (size_t c=0; c<n; c++)

        buf[c] = m_cset->data[psz[c]];
     } else {
       // latin-1 (direct)
        buf[c] = m_cset->data[psz[c]];
     } else {
       // latin-1 (direct)

-      for (size_t c=0; c<=n; c++)
+      for (size_t c=0; c<n; c++)

        buf[c] = psz[c];
     }
        buf[c] = psz[c];
     }

+    return n;

   }
   }

-  return n;
+  return strlen(psz);

 }
 
 size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 }
 
 size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const


@@ -2105,17 +2106,17 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
   ((wxCSConv *)this)->LoadNow(); // discard constness
   if (buf) {
     if (m_cset) {
   ((wxCSConv *)this)->LoadNow(); // discard constness
   if (buf) {
     if (m_cset) {

-      for (size_t c=0; c<=n; c++) {
+      for (size_t c=0; c<n; c++) {

        size_t n;
        for (n=0; (n<256) && (m_cset->data[n] != psz[c]); n++);
        buf[c] = (n>0xff) ? '?' : n;
       }
     } else {
       // latin-1 (direct)
        size_t n;
        for (n=0; (n<256) && (m_cset->data[n] != psz[c]); n++);
        buf[c] = (n>0xff) ? '?' : n;
       }
     } else {
       // latin-1 (direct)

-      for (size_t c=0; c<=n; c++)
+      for (size_t c=0; c<n; c++)

        buf[c] = (psz[c]>0xff) ? '?' : psz[c];
     }
        buf[c] = (psz[c]>0xff) ? '?' : psz[c];
     }

+    return n;

   }
   }

-  return n;
+  return wcslen(psz);

 }
 }

-