Get rid of wxFontMapper in wxBase library.

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index bdb4a659974d8a4c15fb0629c5c2136a14d2d2bf..a679e6bb8fd81dc372c255ca706aae8ea5db8384 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mstream.h
+// Name:        wx/mstream.h

 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -12,51 +12,66 @@
 #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
 

-class WXDLLEXPORT wxMemoryInputStream : public wxInputStream
+#include "wx/stream.h"
+
+class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream

 {
 public:
 {
 public:

-    wxMemoryInputStream(const char *data, size_t length);
+    wxMemoryInputStream(const void *data, size_t length);

     virtual ~wxMemoryInputStream();
     virtual ~wxMemoryInputStream();

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

     virtual bool Eof() const;
     virtual bool Eof() const;

+    virtual bool IsSeekable() const { return true; }

 
     char Peek();
 
 
     char Peek();
 

+    wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
+
+    // deprecated, compatibility only

     wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
 
 protected:
     wxStreamBuffer *m_i_streambuf;
 
     size_t OnSysRead(void *buffer, size_t nbytes);
     wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
 
 protected:
     wxStreamBuffer *m_i_streambuf;
 
     size_t OnSysRead(void *buffer, size_t nbytes);

-    off_t OnSysSeek(off_t pos, wxSeekMode mode);
-    off_t OnSysTell() const;
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysTell() const;

 
 private:
     size_t m_length;
 
 private:
     size_t m_length;

+
+    DECLARE_NO_COPY_CLASS(wxMemoryInputStream)

 };
 
 };
 

-class WXDLLEXPORT wxMemoryOutputStream : public wxOutputStream
+class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream

 {
 public:
 {
 public:

-    wxMemoryOutputStream(char *data = NULL, size_t length = 0);
+    // if data is !NULL it must be allocated with malloc()
+    wxMemoryOutputStream(void *data = NULL, size_t length = 0);

     virtual ~wxMemoryOutputStream();
     virtual ~wxMemoryOutputStream();

-    virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
+    virtual wxFileOffset GetLength() const { return m_o_streambuf->GetLastAccess(); }
+    virtual bool IsSeekable() const { return true; }

 
 

-    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+    size_t CopyTo(void *buffer, size_t len) const;
+
+    wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }

 
 

-    size_t CopyTo(char *buffer, size_t len) const;
+    // deprecated, compatibility only
+    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }

 
 protected:
     wxStreamBuffer *m_o_streambuf;
 
 protected:
     size_t OnSysWrite(const void *buffer, size_t nbytes);
 
 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;
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysTell() const;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)

 };
 
 #endif
 };
 
 #endif