1. bug in wxString::find_first_of() fixed

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 187a0e65495592743949f22fdb6d89b7b3841062..85e0b30e35479f4903f0d54235254486caf13998 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -11,21 +11,23 @@
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 

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

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class wxMemoryInputStream: public wxInputStream {
+class WXDLLEXPORT wxMemoryInputStream: public wxInputStream {

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

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

 
   char Peek();
 
 
   char Peek();
 

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

  protected:
   wxStreamBuffer *m_i_streambuf;
 
  protected:
   wxStreamBuffer *m_i_streambuf;
 


@@ -35,10 +37,15 @@ class wxMemoryInputStream: public wxInputStream {
   off_t OnSysTell() const;
 };
 
   off_t OnSysTell() const;
 };
 

-class wxMemoryOutputStream:  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(); }
+
+  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+
+  size_t CopyTo(char *buffer, size_t len) const;

 
  protected:
   wxStreamBuffer *m_o_streambuf;
 
  protected:
   wxStreamBuffer *m_o_streambuf;