Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index 61ac6044d52426f3fa1267e86932dc7644e2f45d..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);

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


@@ -65,9 +66,9 @@ public:
     wxStringOutputStream(wxString *pString = NULL,
                          wxMBConv& conv = wxConvUTF8)
         : m_conv(conv)
     wxStringOutputStream(wxString *pString = NULL,
                          wxMBConv& conv = wxConvUTF8)
         : m_conv(conv)

-#if wxUSE_UNICODE_WCHAR
+#if wxUSE_UNICODE

         , m_unconv(0)
         , m_unconv(0)

-#endif // wxUSE_UNICODE_WCHAR
+#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);


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


@@ -95,12 +98,12 @@ private:
     // arbitrary 8 bit data
     wxMBConv& m_conv;
 
     // 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