X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4004775e5a0c2da5453668201a4a984b6543d061..f014d4bf3e18198c273b3c119ad1a08d46d12c82:/include/wx/sstream.h diff --git a/include/wx/sstream.h b/include/wx/sstream.h index 0d44a30d82..b264c67021 100644 --- a/include/wx/sstream.h +++ b/include/wx/sstream.h @@ -25,13 +25,10 @@ class WXDLLIMPEXP_BASE wxStringInputStream : public wxInputStream public: // ctor associates the stream with the given string which makes a copy of // it - wxStringInputStream(const wxString& s) - : m_str(s) - { - m_pos = 0; - } + wxStringInputStream(const wxString& s); + virtual ~wxStringInputStream(); - virtual size_t GetSize() const { return m_str.length(); } + virtual wxFileOffset GetLength() const; protected: virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode); @@ -39,13 +36,18 @@ protected: virtual size_t OnSysRead(void *buffer, size_t size); private: - // the string we're reading from + // the string that was passed in the ctor wxString m_str; + // the buffer we're reading from + char* m_buf; + + // length of the buffer we're reading from + size_t m_len; + // position in the stream in bytes, *not* in chars size_t m_pos; - DECLARE_NO_COPY_CLASS(wxStringInputStream) }; @@ -81,6 +83,8 @@ private: // position in the stream in bytes, *not* in chars size_t m_pos; + // string encoding converter (UTF8 is the standard) + wxMBConvUTF8 m_conv; DECLARE_NO_COPY_CLASS(wxStringOutputStream) };