Ryan's cumulative wxActiveX and media control patch (1427775)

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 525c6d9cccc347da6f23cc6b4c842d25aecb3df6..2857dc074d320ab5939fc7e86dc3d23a1dc97f26 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -12,17 +12,22 @@
 #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
 

+#include "wx/stream.h"
+
+class WXDLLIMPEXP_BASE wxMemoryOutputStream;
+

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

+    wxMemoryInputStream(const wxMemoryOutputStream& stream);

     virtual ~wxMemoryInputStream();
     virtual wxFileOffset GetLength() const { return m_length; }
     virtual ~wxMemoryInputStream();
     virtual wxFileOffset GetLength() const { return m_length; }

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

 
     char Peek();
 
 
     char Peek();
 


@@ -51,6 +56,7 @@ public:
     wxMemoryOutputStream(void *data = NULL, size_t length = 0);
     virtual ~wxMemoryOutputStream();
     virtual wxFileOffset GetLength() const { return m_o_streambuf->GetLastAccess(); }
     wxMemoryOutputStream(void *data = NULL, size_t length = 0);
     virtual ~wxMemoryOutputStream();
     virtual wxFileOffset GetLength() const { return m_o_streambuf->GetLastAccess(); }

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

 
     size_t CopyTo(void *buffer, size_t len) const;
 
 
     size_t CopyTo(void *buffer, size_t len) const;