Add functor-taking overload of CallAfter().

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

diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index 1b2cbd08977d45f60ac3afad6b2511ce756be0be..318cf776b72aaaad99a4db839d0c7f2d9aeb3d40 100644 (file)
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -28,6 +28,7 @@ public:
     wxStringInputStream(const wxString& s);
 
     virtual wxFileOffset GetLength() const;
     wxStringInputStream(const wxString& s);
 
     virtual wxFileOffset GetLength() const;

+    virtual bool IsSeekable() const { return true; }

 
 protected:
     virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);
 
 protected:
     virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);


@@ -47,7 +48,7 @@ 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;
 

-    DECLARE_NO_COPY_CLASS(wxStringInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxStringInputStream);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -59,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()
 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);
     {
         m_str = pString ? pString : &m_strInternal;
         m_pos = m_str->length() / sizeof(wxChar);


@@ -71,6 +77,8 @@ public:
     // get the string containing current output
     const wxString& GetString() const { return *m_str; }
 
     // 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);
 protected:
     virtual wxFileOffset OnSysTell() const;
     virtual size_t OnSysWrite(const void *buffer, size_t size);


@@ -85,19 +93,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
+    // 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;
     // 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
 };
 
 #endif // wxUSE_STREAMS