Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

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

diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index e188c1a00cd8c87d4739e59d97b6b9e69299cd04..1b2cbd08977d45f60ac3afad6b2511ce756be0be 100644 (file)
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -25,27 +25,28 @@ class WXDLLIMPEXP_BASE wxStringInputStream : public wxInputStream
 public:
     // ctor associates the stream with the given string which makes a copy of
     // it
 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 size_t GetSize() const { return m_str.length(); }
+    virtual wxFileOffset GetLength() const;

 
 protected:
 
 protected:

-    virtual off_t OnSysSeek(off_t ofs, wxSeekMode mode);
-    virtual off_t OnSysTell() const;
+    virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);
+    virtual wxFileOffset OnSysTell() const;

     virtual size_t OnSysRead(void *buffer, size_t size);
 
 private:
     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;
 
     wxString m_str;
 

+    // the buffer we're reading from
+    wxCharBuffer 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;
 
     // position in the stream in bytes, *not* in chars
     size_t m_pos;
 

-

     DECLARE_NO_COPY_CLASS(wxStringInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxStringInputStream)
 };
 


@@ -59,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);


@@ -68,7 +72,7 @@ public:
     const wxString& GetString() const { return *m_str; }
 
 protected:
     const wxString& GetString() const { return *m_str; }
 
 protected:

-    virtual off_t OnSysTell() const;
+    virtual wxFileOffset OnSysTell() const;

     virtual size_t OnSysWrite(const void *buffer, size_t size);
 
 private:
     virtual size_t OnSysWrite(const void *buffer, size_t size);
 
 private:


@@ -81,6 +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;
+#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)
 };