X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c17722ec8a15d93ef9ec4a4ff390a0db9a34d9d..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/sstream.h diff --git a/include/wx/sstream.h b/include/wx/sstream.h index f8e75790ab..318cf776b7 100644 --- a/include/wx/sstream.h +++ b/include/wx/sstream.h @@ -26,9 +26,9 @@ 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; + virtual bool IsSeekable() const { return true; } protected: virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode); @@ -40,7 +40,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; @@ -48,7 +48,7 @@ private: // position in the stream in bytes, *not* in chars size_t m_pos; - DECLARE_NO_COPY_CLASS(wxStringInputStream) + wxDECLARE_NO_COPY_CLASS(wxStringInputStream); }; // ---------------------------------------------------------------------------- @@ -60,10 +60,15 @@ class WXDLLIMPEXP_BASE wxStringOutputStream : public wxOutputStream 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 + // + // Note that the conversion object should have the life time greater than + // this stream. + wxStringOutputStream(wxString *pString = NULL, + wxMBConv& conv = wxConvUTF8) + : m_conv(conv) +#if wxUSE_UNICODE + , m_unconv(0) +#endif // wxUSE_UNICODE { m_str = pString ? pString : &m_strInternal; m_pos = m_str->length() / sizeof(wxChar); @@ -72,6 +77,8 @@ public: // get the string containing current output const wxString& GetString() const { return *m_str; } + virtual bool IsSeekable() const { return true; } + protected: virtual wxFileOffset OnSysTell() const; virtual size_t OnSysWrite(const void *buffer, size_t size); @@ -86,19 +93,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 + // converter to use: notice that with the default UTF-8 one the input + // stream must contain valid UTF-8 data, use wxConvISO8859_1 to work with + // arbitrary 8 bit data + wxMBConv& m_conv; -#if wxUSE_UNICODE_WCHAR +#if wxUSE_UNICODE // unconverted data from the last call to OnSysWrite() wxMemoryBuffer m_unconv; -#endif // wxUSE_UNICODE_WCHAR +#endif // wxUSE_UNICODE - DECLARE_NO_COPY_CLASS(wxStringOutputStream) + wxDECLARE_NO_COPY_CLASS(wxStringOutputStream); }; #endif // wxUSE_STREAMS