added wxUTF8StringBuffer for writing UTF8 data into wxString efficiently, similarly...

[wxWidgets.git] / include / wx / sstream.h

diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index b264c670216d9704968cd05bf9f31fcd619b6310..1b2cbd08977d45f60ac3afad6b2511ce756be0be 100644 (file)
--- 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);
     // 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 wxFileOffset GetLength() const;
 


@@ -40,7 +39,7 @@ private:
     wxString m_str;
 
     // the buffer we're reading from
     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;
 
     // 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)
     // 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);
     {
         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;
 
     // 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;
     // 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)
 };
 
     DECLARE_NO_COPY_CLASS(wxStringOutputStream)
 };