added wxMenu::AppendSubMenu() to avoid having to specify a dummy id when adding a...

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 2719d90474caf2bcb137c16b6bd3824e76046e59..ef344236c35740c1b415b2529cc0b0ba00f6909e 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -12,25 +12,31 @@
 #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
 

+#include "wx/stream.h"
+
+class WXDLLIMPEXP_BASE wxMemoryOutputStream;
+

 class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {
 public:
     wxMemoryInputStream(const void *data, size_t length);
 class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {
 public:
     wxMemoryInputStream(const void *data, size_t length);

+    wxMemoryInputStream(const wxMemoryOutputStream& stream);

     virtual ~wxMemoryInputStream();
     virtual wxFileOffset GetLength() const { return m_length; }
     virtual ~wxMemoryInputStream();
     virtual wxFileOffset GetLength() const { return m_length; }

-    virtual bool Eof() const;

     virtual bool IsSeekable() const { return true; }
 
     char Peek();
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
     virtual bool IsSeekable() const { return true; }
 
     char Peek();
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, compatibility only
     // deprecated, compatibility only

-    wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+    wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

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


@@ -58,8 +64,10 @@ public:
 
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 
 
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, compatibility only
     // deprecated, compatibility only

-    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+    wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

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


@@ -72,9 +80,13 @@ protected:
     DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 

+#if WXWIN_COMPATIBILITY_2_6
+    inline wxStreamBuffer *wxMemoryInputStream::InputStreamBuffer() const { return m_i_streambuf; }
+    inline wxStreamBuffer *wxMemoryOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
+#endif // WXWIN_COMPATIBILITY_2_6
+

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

-