X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5d99d7b5c4afa4fba509d751937d5e6cb7b2703..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/sstream.h diff --git a/include/wx/sstream.h b/include/wx/sstream.h index b264c67021..1b2cbd0897 100644 --- a/include/wx/sstream.h +++ b/include/wx/sstream.h @@ -26,7 +26,6 @@ public: // ctor associates the stream with the given string which makes a copy of // it wxStringInputStream(const wxString& s); - virtual ~wxStringInputStream(); virtual wxFileOffset GetLength() const; @@ -40,7 +39,7 @@ private: wxString m_str; // the buffer we're reading from - char* m_buf; + wxCharBuffer m_buf; // length of the buffer we're reading from size_t m_len; @@ -61,6 +60,9 @@ public: // The stream will write data either to the provided string or to an // internal string which can be retrieved using GetString() wxStringOutputStream(wxString *pString = NULL) +#if wxUSE_UNICODE_WCHAR + : m_unconv(0) +#endif // wxUSE_UNICODE_WCHAR { m_str = pString ? pString : &m_strInternal; m_pos = m_str->length() / sizeof(wxChar); @@ -83,8 +85,17 @@ private: // position in the stream in bytes, *not* in chars size_t m_pos; +#if wxUSE_WCHAR_T // string encoding converter (UTF8 is the standard) wxMBConvUTF8 m_conv; +#else + wxMBConv m_conv; +#endif + +#if wxUSE_UNICODE_WCHAR + // unconverted data from the last call to OnSysWrite() + wxMemoryBuffer m_unconv; +#endif // wxUSE_UNICODE_WCHAR DECLARE_NO_COPY_CLASS(wxStringOutputStream) };