rename the ID parameter

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 1f9a8aea9f920fcca9d60a9498e5eeb22641eb17..ef344236c35740c1b415b2529cc0b0ba00f6909e 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -12,31 +12,38 @@
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 

-#include "wx/stream.h"
+#include "wx/defs.h"

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class WXDLLEXPORT_BASE wxMemoryInputStream : public wxInputStream
+#include "wx/stream.h"
+
+class WXDLLIMPEXP_BASE wxMemoryOutputStream;
+
+class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream

 {
 public:
     wxMemoryInputStream(const void *data, size_t length);
 {
 public:
     wxMemoryInputStream(const void *data, size_t length);

+    wxMemoryInputStream(const wxMemoryOutputStream& stream);

     virtual ~wxMemoryInputStream();
     virtual ~wxMemoryInputStream();

-    virtual size_t GetSize() const { return m_length; }
-    virtual bool Eof() const;
+    virtual wxFileOffset GetLength() const { return m_length; }
+    virtual bool IsSeekable() const { return true; }

 
     char Peek();
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
 
     char Peek();
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, compatibility only
     // deprecated, compatibility only

-    wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+    wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     wxStreamBuffer *m_i_streambuf;
 
     size_t OnSysRead(void *buffer, size_t nbytes);
 
 protected:
     wxStreamBuffer *m_i_streambuf;
 
     size_t OnSysRead(void *buffer, size_t nbytes);

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

 
 private:
     size_t m_length;
 
 private:
     size_t m_length;


@@ -44,35 +51,42 @@ private:
     DECLARE_NO_COPY_CLASS(wxMemoryInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxMemoryInputStream)
 };
 

-class WXDLLEXPORT_BASE wxMemoryOutputStream : public wxOutputStream
+class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream

 {
 public:
     // if data is !NULL it must be allocated with malloc()
     wxMemoryOutputStream(void *data = NULL, size_t length = 0);
     virtual ~wxMemoryOutputStream();
 {
 public:
     // 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(); }
+    virtual wxFileOffset GetLength() const { return m_o_streambuf->GetLastAccess(); }
+    virtual bool IsSeekable() const { return true; }

 
     size_t CopyTo(void *buffer, size_t len) const;
 
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 
 
     size_t CopyTo(void *buffer, size_t len) const;
 
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, compatibility only
     // deprecated, compatibility only

-    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+    wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     wxStreamBuffer *m_o_streambuf;
 
 protected:
     size_t OnSysWrite(const void *buffer, size_t nbytes);
 
 protected:
     wxStreamBuffer *m_o_streambuf;
 
 protected:
     size_t OnSysWrite(const void *buffer, size_t nbytes);

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

 
     DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 
 
     DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 

+#if WXWIN_COMPATIBILITY_2_6
+    inline wxStreamBuffer *wxMemoryInputStream::InputStreamBuffer() const { return m_i_streambuf; }
+    inline wxStreamBuffer *wxMemoryOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
+#endif // WXWIN_COMPATIBILITY_2_6
+

 #endif
   // wxUSE_STREAMS
 
 #endif
   // _WX_WXMMSTREAM_H__
 #endif
   // wxUSE_STREAMS
 
 #endif
   // _WX_WXMMSTREAM_H__

-