wXMotif compilation fixes

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 9cc7aab26a5404b167ff5ccf8a1550317af3c0b2..7a71e8059a3dd3cdb442922f6b6d763ae0a9f188 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -8,69 +8,57 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXMMSTREAM_H__
-#define __WXMMSTREAM_H__
+#ifndef _WX_WXMMSTREAM_H__
+#define _WX_WXMMSTREAM_H__

 
 

-#include <wx/stream.h>
+#include "wx/stream.h"

 
 

-class wxMemoryStreamBase: public wxStream {
-  DECLARE_CLASS(wxMemoryStreamBase)
- public:
-  wxMemoryStreamBase(char *data, size_t length, int iolimit);
-  virtual ~wxMemoryStreamBase();
-
-  // Input part
-  wxInputStream& Read(void *buffer, size_t size);
-  size_t SeekI(int pos, wxWhenceType whence = wxBeginPosition);
-  size_t TellI() const { return m_position_i; }
+#if wxUSE_STREAMS

 
 

-  bool Eof() const { return m_eof; }
-  size_t LastRead() const { return m_lastread; }
+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; }

 
 

-  // Output part
-  wxOutputStream& Write(const void *buffer, size_t size);
-  size_t SeekO(int pos, wxWhenceType whence = wxBeginPosition);
-  size_t TellO() const { return m_position_o; }
+  char Peek();

 
 

-  bool Bad() const { return m_bad; }
-  size_t LastWrite() const { return m_lastwrite; }
-  void Sync() {}
+  wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }

 
  protected:
 
  protected:

-  bool ChangeBufferSize(size_t new_length);
+  wxStreamBuffer *m_i_streambuf;

 
  protected:
 
  protected:

-  bool m_bad, m_eof, m_persistent;
-  size_t m_lastread, m_lastwrite;
-  size_t m_length;
-  size_t m_position_i, m_position_o;
-  char *m_buffer;
-  int m_iolimit;
+  size_t OnSysRead(void *buffer, size_t nbytes);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;

 };
 
 };
 

-
-class wxMemoryInputStream: public wxMemoryStreamBase {
-  DECLARE_CLASS(wxMemoryInputStream)
+class wxMemoryOutputStream:  public wxOutputStream {

  public:
  public:

-  wxMemoryInputStream(char *data, size_t length)
-     : wxMemoryStreamBase(data, length, 1)
-    {}
-};
+  wxMemoryOutputStream(char *data = NULL, size_t length = 0);
+  virtual ~wxMemoryOutputStream();
+  virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }

 
 

-class wxMemoryOutputStream: public wxMemoryStreamBase {
-  DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
- public:
-  wxMemoryOutputStream(char *data = NULL, size_t length = 0)
-     : wxMemoryStreamBase(data, length, 2)
-   {}
-};
+  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }

 
 

-class wxMemoryStream: public wxMemoryStreamBase {
-  DECLARE_DYNAMIC_CLASS(wxMemoryStream)
- public:
-  wxMemoryStream(char *data = NULL, size_t length = 0)
-     : wxMemoryStreamBase(data, length, 0)
-   {}
+  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
 };
 
 #endif

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