X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0286d08d1453506f9ff9a830d58b3b35817d0b14..419a3607032dc850b5045c622e3f10caa9e1cf91:/include/wx/strconv.h?ds=sidebyside

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 1edf4f5082..e78282f922 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -25,7 +25,9 @@
 #  undef __BSEXCPT__
 #endif
 
+#ifndef __WXPALMOS5__
 #include <stdlib.h>
+#endif // ! __WXPALMOS5__
 
 #if wxUSE_WCHAR_T
 
@@ -290,8 +292,11 @@ public:
     };
 
     wxMBConvUTF8(int options = MAP_INVALID_UTF8_NOT) : m_options(options) { }
-    virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const;
-    virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
+
+    virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen = wxNO_LEN) const;
+    virtual size_t FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen = wxNO_LEN) const;
 
     virtual wxMBConv *Clone() const { return new wxMBConvUTF8(m_options); }