Compile fixes and typos corrected.

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index c25fc94a85dcdca9977ef144f769355272271cd0..61a9df7effeced38d3729effeab34704d89e61fb 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -13,24 +13,52 @@
 
 #include <wx/stream.h>
 
+#if wxUSE_STREAMS
+
 class wxMemoryInputStream: public wxInputStream {
+ private:
+  size_t m_length;
+  
  public:
   wxMemoryInputStream(const char *data, size_t length);
   virtual ~wxMemoryInputStream();
+  virtual size_t GetSize() const { return m_length; }
 
   char Peek();
+
+  wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+
+ protected:
+  wxStreamBuffer *m_i_streambuf;
+
+ protected:
+  size_t OnSysRead(void *buffer, size_t nbytes);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
 };
 
 class wxMemoryOutputStream:  public wxOutputStream {
  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();
-};
+  virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
 
-class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {
- public:
-  wxMemoryStream(char *data = NULL, size_t length = 0);
-  virtual ~wxMemoryStream();
+  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+
+  size_t CopyTo(char *buffer, size_t len) const;
+
+ 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;
 };
 
 #endif
+  // wxUSE_STREAMS
+
+#endif
+  // _WX_WXMMSTREAM_H__
+