implement To/FromWchar() as wxCSConv methods, otherwise wxCSConv(wxFONTENCODING_UTF16...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index d48ae1e44b7ded6cb1a440d3fe98b332b1c4ea79..947efad79966bc0d8c9292675e972f1afe6751e2 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -373,9 +373,14 @@ public:
 
     wxCSConv& operator=(const wxCSConv& conv);
 
 
     wxCSConv& operator=(const wxCSConv& conv);
 

+    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 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 GetMBNulLen() const;
     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 GetMBNulLen() const;

+

     virtual wxMBConv *Clone() const { return new wxCSConv(*this); }
 
     void Clear();
     virtual wxMBConv *Clone() const { return new wxCSConv(*this); }
 
     void Clear();

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 95ef4240421423b71948f04911ffcdd85067e4ad..b80d82fdb62a2460450f7da315530afc8319ff03 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3518,6 +3518,24 @@ void wxCSConv::CreateConvIfNeeded() const
     }
 }
 
     }
 }
 

+size_t wxCSConv::ToWChar(wchar_t *dst, size_t dstLen,
+                         const char *src, size_t srcLen) const
+{
+    CreateConvIfNeeded();
+
+    return m_convReal ? m_convReal->ToWChar(dst, dstLen, src, srcLen)
+                      : wxCONV_FAILED;
+}
+
+size_t wxCSConv::FromWChar(char *dst, size_t dstLen,
+                           const wchar_t *src, size_t srcLen) const
+{
+    CreateConvIfNeeded();
+
+    return m_convReal ? m_convReal->FromWChar(dst, dstLen, src, srcLen)
+                      : wxCONV_FAILED;
+}
+

 size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
     CreateConvIfNeeded();
 size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
 {
     CreateConvIfNeeded();