Applied DrawArc patch.

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index a07ce80cebf38307f973c1148f7d7a5c7d022145..85e0b30e35479f4903f0d54235254486caf13998 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -11,61 +11,54 @@
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 

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

 
 

-class wxMemoryStreamBase {
- protected:
-  wxMemoryStreamBase();
-  virtual ~wxMemoryStreamBase();
-
-  bool ChangeBufferSize(size_t new_length);
+#if wxUSE_STREAMS

 
 

- protected:
-  bool m_persistent;
+class WXDLLEXPORT wxMemoryInputStream: public wxInputStream {
+ private:

   size_t m_length;
   size_t m_length;

-  char *m_buffer;
-  int m_iolimit;
-};
-
-class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream {
+  

  public:
   wxMemoryInputStream(const char *data, size_t length);
   virtual ~wxMemoryInputStream();
  public:
   wxMemoryInputStream(const char *data, size_t length);
   virtual ~wxMemoryInputStream();

+  virtual size_t GetSize() const { return m_length; }

 
   char Peek();
 
 
   char Peek();
 

+  wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+

  protected:
  protected:

- 
-  size_t DoRead(void *buffer, size_t size);
-  off_t DoSeekInput(off_t pos, wxSeekMode mode);
-  off_t DoTellInput() const { return m_position_i; }
+  wxStreamBuffer *m_i_streambuf;

 
  protected:
 
  protected:

-  off_t m_position_i;
+  size_t OnSysRead(void *buffer, size_t nbytes);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;

 };
 
 };
 

-class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
+class WXDLLEXPORT wxMemoryOutputStream:  public wxOutputStream {

  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();
  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();

+  virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }

 
 

-  char *GetData() { Sync(); return m_buffer; }
-  size_t GetLength() { Sync(); return m_length; }
+  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }

 
 

- protected:
+  size_t CopyTo(char *buffer, size_t len) const;

 
 

-  size_t DoWrite(const void *buffer, size_t size);
-  off_t DoSeekOutput(off_t pos, wxSeekMode mode);
-  off_t DoTellOutput() const { return m_position_o; }
+ protected:
+  wxStreamBuffer *m_o_streambuf;

 
  protected:
 
  protected:

-  off_t m_position_o;
+  size_t OnSysWrite(const void *buffer, size_t nbytes);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;

 };
 
 };
 

-class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {
- public:
-  wxMemoryStream(char *data = NULL, size_t length = 0);
-  virtual ~wxMemoryStream();
-};
+#endif
+  // wxUSE_STREAMS

 
 #endif
 
 #endif

+  // _WX_WXMMSTREAM_H__
+