fixed wxString::utf8_str() in UTF8 build to return buffer with length

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 5b29a2546dd91bcf2c97d4de04cde10b97a5aaa7..99a90164e4bfa1dfa4e06d982ac16bbfa8c6a77c 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1711,9 +1711,7 @@ public:
     }
 
     const wxScopedCharBuffer utf8_str() const
     }
 
     const wxScopedCharBuffer utf8_str() const

-        { return wxCharBuffer::CreateNonOwned(wx_str()); }
-    const wxScopedCharBuffer ToUTF8() const
-        { return wxCharBuffer::CreateNonOwned(wx_str()); }
+        { return wxCharBuffer::CreateNonOwned(m_impl.c_str(), m_impl.length()); }

 
     // this function exists in UTF-8 build only and returns the length of the
     // internal UTF-8 representation
 
     // this function exists in UTF-8 build only and returns the length of the
     // internal UTF-8 representation


@@ -1729,7 +1727,6 @@ public:
         return s;
     }
     const wxScopedCharBuffer utf8_str() const { return mb_str(wxMBConvUTF8()); }
         return s;
     }
     const wxScopedCharBuffer utf8_str() const { return mb_str(wxMBConvUTF8()); }

-    const wxScopedCharBuffer ToUTF8() const { return utf8_str(); }

 #else // ANSI
     static wxString FromUTF8(const char *utf8)
       { return wxString(wxMBConvUTF8().cMB2WC(utf8)); }
 #else // ANSI
     static wxString FromUTF8(const char *utf8)
       { return wxString(wxMBConvUTF8().cMB2WC(utf8)); }


@@ -1758,9 +1755,10 @@ public:
     }
     const wxScopedCharBuffer utf8_str() const
       { return wxMBConvUTF8().cWC2MB(wc_str()); }
     }
     const wxScopedCharBuffer utf8_str() const
       { return wxMBConvUTF8().cWC2MB(wc_str()); }

-    const wxScopedCharBuffer ToUTF8() const { return utf8_str(); }

 #endif
 
 #endif
 

+    const wxScopedCharBuffer ToUTF8() const { return utf8_str(); }
+

     // functions for storing binary data in wxString:
 #if wxUSE_UNICODE
     static wxString From8BitData(const char *data, size_t len)
     // functions for storing binary data in wxString:
 #if wxUSE_UNICODE
     static wxString From8BitData(const char *data, size_t len)