oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 525c6d9cccc347da6f23cc6b4c842d25aecb3df6..a679e6bb8fd81dc372c255ca706aae8ea5db8384 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -12,10 +12,12 @@
 #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 wxMemoryInputStream : public wxInputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {
 public:


@@ -23,6 +25,7 @@ public:
     virtual ~wxMemoryInputStream();
     virtual wxFileOffset GetLength() const { return m_length; }
     virtual bool Eof() const;
     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 +54,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;