X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c714a5d0718a51c57338986e9736f58ae355042..d40e9e06bbccc5bc4a73e4138d1f11c50cec7aa9:/src/common/strconv.cpp?ds=sidebyside

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index b80d82fdb6..f442e54dcd 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3523,8 +3523,11 @@ size_t wxCSConv::ToWChar(wchar_t *dst, size_t dstLen,
 {
     CreateConvIfNeeded();
 
-    return m_convReal ? m_convReal->ToWChar(dst, dstLen, src, srcLen)
-                      : wxCONV_FAILED;
+    if (m_convReal)
+        return m_convReal->ToWChar(dst, dstLen, src, srcLen);
+
+    // latin-1 (direct)
+    return wxMBConv::ToWChar(dst, dstLen, src, srcLen);
 }
 
 size_t wxCSConv::FromWChar(char *dst, size_t dstLen,
@@ -3532,8 +3535,11 @@ size_t wxCSConv::FromWChar(char *dst, size_t dstLen,
 {
     CreateConvIfNeeded();
 
-    return m_convReal ? m_convReal->FromWChar(dst, dstLen, src, srcLen)
-                      : wxCONV_FAILED;
+    if (m_convReal)
+        return m_convReal->FromWChar(dst, dstLen, src, srcLen);
+
+    // latin-1 (direct)
+    return wxMBConv::FromWChar(dst, dstLen, src, srcLen);
 }
 
 size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const