applied patch 890642: wxRE_ADVANCED flag and docs

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index bdb4a659974d8a4c15fb0629c5c2136a14d2d2bf..fca461b5dc3910a5f4285832aa2c06cdb4b5ee14 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mstream.h
+// Name:        wx/mstream.h
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -16,16 +16,19 @@
 
 #if wxUSE_STREAMS
 
-class WXDLLEXPORT wxMemoryInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {
 public:
-    wxMemoryInputStream(const char *data, size_t length);
+    wxMemoryInputStream(const void *data, size_t length);
     virtual ~wxMemoryInputStream();
     virtual size_t GetSize() const { return m_length; }
     virtual bool Eof() const;
 
     char Peek();
 
+    wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
+
+    // deprecated, compatibility only
     wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
 
 protected:
@@ -37,18 +40,24 @@ protected:
 
 private:
     size_t m_length;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryInputStream)
 };
 
-class WXDLLEXPORT wxMemoryOutputStream : public wxOutputStream
+class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream
 {
 public:
-    wxMemoryOutputStream(char *data = NULL, size_t length = 0);
+    // if data is !NULL it must be allocated with malloc()
+    wxMemoryOutputStream(void *data = NULL, size_t length = 0);
     virtual ~wxMemoryOutputStream();
     virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
 
-    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+    size_t CopyTo(void *buffer, size_t len) const;
 
-    size_t CopyTo(char *buffer, size_t len) const;
+    wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
+
+    // deprecated, compatibility only
+    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
 
 protected:
     wxStreamBuffer *m_o_streambuf;
@@ -57,6 +66,8 @@ protected:
     size_t OnSysWrite(const void *buffer, size_t nbytes);
     off_t OnSysSeek(off_t pos, wxSeekMode mode);
     off_t OnSysTell() const;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 
 #endif