Rebake from clean wx tree.

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index dc574b220028e75bd34fc77dff5086c6dc16481e..9119658421f46abac4b57c6de3087b989ef94eaf 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -12,10 +12,6 @@
 #ifndef _WX_WXSTREAM_H__
 #define _WX_WXSTREAM_H__
 
 #ifndef _WX_WXSTREAM_H__
 #define _WX_WXSTREAM_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "stream.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_STREAMS
 #include "wx/defs.h"
 
 #if wxUSE_STREAMS


@@ -25,9 +21,9 @@
 #include "wx/string.h"
 #include "wx/filefn.h"  // for wxFileOffset, wxInvalidOffset and wxSeekMode
 
 #include "wx/string.h"
 #include "wx/filefn.h"  // for wxFileOffset, wxInvalidOffset and wxSeekMode
 

-class WXDLLIMPEXP_BASE wxStreamBase;
-class WXDLLIMPEXP_BASE wxInputStream;
-class WXDLLIMPEXP_BASE wxOutputStream;
+class WXDLLIMPEXP_FWD_BASE wxStreamBase;
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
+class WXDLLIMPEXP_FWD_BASE wxOutputStream;

 
 typedef wxInputStream& (*__wxInputManip)(wxInputStream&);
 typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);
 
 typedef wxInputStream& (*__wxInputManip)(wxInputStream&);
 typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);


@@ -46,18 +42,7 @@ enum wxStreamError
     wxSTREAM_READ_ERROR         // generic read error
 };
 
     wxSTREAM_READ_ERROR         // generic read error
 };
 

-// compatibility
-#if WXWIN_COMPATIBILITY_2_2
-    #define wxStream_NOERROR    wxSTREAM_NOERROR
-    #define wxStream_EOF        wxSTREAM_EOF
-    #define wxStream_WRITE_ERR  wxSTREAM_WRITE_ERROR
-    #define wxStream_READ_ERR   wxSTREAM_READ_ERROR
-
-    #define wxSTREAM_NO_ERR     wxSTREAM_NO_ERROR
-    #define wxSTREAM_NOERROR    wxSTREAM_NO_ERROR
-    #define wxSTREAM_WRITE_ERR  wxSTREAM_WRITE_ERROR
-    #define wxSTREAM_READ_ERR   wxSTREAM_READ_ERROR
-#endif // WXWIN_COMPATIBILITY_2_2
+const int wxEOF = -1;

 
 // ============================================================================
 // base stream classes: wxInputStream and wxOutputStream
 
 // ============================================================================
 // base stream classes: wxInputStream and wxOutputStream


@@ -67,7 +52,7 @@ enum wxStreamError
 // wxStreamBase: common (but non virtual!) base for all stream classes
 // ---------------------------------------------------------------------------
 
 // wxStreamBase: common (but non virtual!) base for all stream classes
 // ---------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxStreamBase
+class WXDLLIMPEXP_BASE wxStreamBase : public wxObject

 {
 public:
     wxStreamBase();
 {
 public:
     wxStreamBase();


@@ -75,7 +60,7 @@ public:
 
     // error testing
     wxStreamError GetLastError() const { return m_lasterror; }
 
     // error testing
     wxStreamError GetLastError() const { return m_lasterror; }

-    bool IsOk() const { return GetLastError() == wxSTREAM_NO_ERROR; }
+    virtual bool IsOk() const { return GetLastError() == wxSTREAM_NO_ERROR; }

     bool operator!() const { return !IsOk(); }
 
     // reset the stream state
     bool operator!() const { return !IsOk(); }
 
     // reset the stream state


@@ -85,11 +70,8 @@ public:
     virtual size_t GetSize() const;
     virtual wxFileOffset GetLength() const { return wxInvalidOffset; }
 
     virtual size_t GetSize() const;
     virtual wxFileOffset GetLength() const { return wxInvalidOffset; }
 

-#if WXWIN_COMPATIBILITY_2_2
-    // deprecated, for compatibility only
-    wxStreamError LastError() const { return m_lasterror; }
-    size_t StreamSize() const { return GetSize(); }
-#endif // WXWIN_COMPATIBILITY_2_2
+    // returns true if the streams supports seeking to arbitrary offsets
+    virtual bool IsSeekable() const { return false; }

 
 protected:
     virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
 
 protected:
     virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);


@@ -100,7 +82,8 @@ protected:
 
     friend class wxStreamBuffer;
 
 
     friend class wxStreamBuffer;
 

-    DECLARE_NO_COPY_CLASS(wxStreamBase)
+    DECLARE_ABSTRACT_CLASS(wxStreamBase)
+    wxDECLARE_NO_COPY_CLASS(wxStreamBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -126,11 +109,11 @@ public:
     // undefined), otherwise 1
     virtual char Peek();
 
     // undefined), otherwise 1
     virtual char Peek();
 

-    // return one character from the stream, blocking until it appears if
+    // return one byte from the stream, blocking until it appears if

     // necessary
     //
     // necessary
     //

-    // if EOF, return value is undefined and LastRead() will return 0 and not 1
-    char GetC();
+    // on success returns a value between 0 - 255, or wxEOF on EOF or error.
+    int GetC();

 
     // read at most the given number of bytes from the stream
     //
 
     // read at most the given number of bytes from the stream
     //


@@ -208,7 +191,7 @@ public:
 protected:
     // do read up to size bytes of data into the provided buffer
     //
 protected:
     // do read up to size bytes of data into the provided buffer
     //

-    // this method should return 0 if EOF has been reached or an error occured
+    // this method should return 0 if EOF has been reached or an error occurred

     // (m_lasterror should be set accordingly as well) or the number of bytes
     // read
     virtual size_t OnSysRead(void *buffer, size_t size) = 0;
     // (m_lasterror should be set accordingly as well) or the number of bytes
     // read
     virtual size_t OnSysRead(void *buffer, size_t size) = 0;


@@ -234,7 +217,8 @@ protected:
 
     friend class wxStreamBuffer;
 
 
     friend class wxStreamBuffer;
 

-    DECLARE_NO_COPY_CLASS(wxInputStream)
+    DECLARE_ABSTRACT_CLASS(wxInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxInputStream);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -257,6 +241,7 @@ public:
     virtual size_t LastWrite() const { return wxStreamBase::m_lastcount; }
 
     virtual void Sync();
     virtual size_t LastWrite() const { return wxStreamBase::m_lastcount; }
 
     virtual void Sync();

+    virtual bool Close() { return true; }

 
     wxOutputStream& operator<<(wxInputStream& out) { return Write(out); }
     wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }
 
     wxOutputStream& operator<<(wxInputStream& out) { return Write(out); }
     wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }


@@ -268,7 +253,8 @@ protected:
 
     friend class wxStreamBuffer;
 
 
     friend class wxStreamBuffer;
 

-    DECLARE_NO_COPY_CLASS(wxOutputStream)
+    DECLARE_ABSTRACT_CLASS(wxOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxOutputStream);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -285,7 +271,8 @@ public:
     wxCountingOutputStream();
 
     wxFileOffset GetLength() const;
     wxCountingOutputStream();
 
     wxFileOffset GetLength() const;

-    bool Ok() const { return true; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return true; }

 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t size);
 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t size);


@@ -294,7 +281,8 @@ protected:
 
     size_t m_currentPos;
 
 
     size_t m_currentPos;
 

-    DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
+    DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -306,6 +294,7 @@ class WXDLLIMPEXP_BASE wxFilterInputStream : public wxInputStream
 public:
     wxFilterInputStream();
     wxFilterInputStream(wxInputStream& stream);
 public:
     wxFilterInputStream();
     wxFilterInputStream(wxInputStream& stream);

+    wxFilterInputStream(wxInputStream *stream);

     virtual ~wxFilterInputStream();
 
     char Peek() { return m_parent_i_stream->Peek(); }
     virtual ~wxFilterInputStream();
 
     char Peek() { return m_parent_i_stream->Peek(); }


@@ -316,8 +305,10 @@ public:
 
 protected:
     wxInputStream *m_parent_i_stream;
 
 protected:
     wxInputStream *m_parent_i_stream;

+    bool m_owns;

 
 

-    DECLARE_NO_COPY_CLASS(wxFilterInputStream)
+    DECLARE_ABSTRACT_CLASS(wxFilterInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFilterInputStream);

 };
 
 class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream
 };
 
 class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream


@@ -325,16 +316,85 @@ class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream
 public:
     wxFilterOutputStream();
     wxFilterOutputStream(wxOutputStream& stream);
 public:
     wxFilterOutputStream();
     wxFilterOutputStream(wxOutputStream& stream);

+    wxFilterOutputStream(wxOutputStream *stream);

     virtual ~wxFilterOutputStream();
 
     wxFileOffset GetLength() const { return m_parent_o_stream->GetLength(); }
 
     wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; }
 
     virtual ~wxFilterOutputStream();
 
     wxFileOffset GetLength() const { return m_parent_o_stream->GetLength(); }
 
     wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; }
 

+    bool Close();
+

 protected:
     wxOutputStream *m_parent_o_stream;
 protected:
     wxOutputStream *m_parent_o_stream;

+    bool m_owns;
+
+    DECLARE_ABSTRACT_CLASS(wxFilterOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFilterOutputStream);
+};
+
+enum wxStreamProtocolType
+{
+    wxSTREAM_PROTOCOL,  // wxFileSystem protocol (should be only one)
+    wxSTREAM_MIMETYPE,  // MIME types the stream handles
+    wxSTREAM_ENCODING,  // The HTTP Content-Encodings the stream handles
+    wxSTREAM_FILEEXT    // File extensions the stream handles
+};
+
+void WXDLLIMPEXP_BASE wxUseFilterClasses();
+
+class WXDLLIMPEXP_BASE wxFilterClassFactoryBase : public wxObject
+{
+public:
+    virtual ~wxFilterClassFactoryBase() { }

 
 

-    DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
+    wxString GetProtocol() const { return wxString(*GetProtocols()); }
+    wxString PopExtension(const wxString& location) const;
+
+    virtual const wxChar * const *GetProtocols(wxStreamProtocolType type
+                                               = wxSTREAM_PROTOCOL) const = 0;
+
+    bool CanHandle(const wxString& protocol,
+                   wxStreamProtocolType type
+                   = wxSTREAM_PROTOCOL) const;
+
+protected:
+    wxString::size_type FindExtension(const wxString& location) const;
+
+    DECLARE_ABSTRACT_CLASS(wxFilterClassFactoryBase)
+};
+
+class WXDLLIMPEXP_BASE wxFilterClassFactory : public wxFilterClassFactoryBase
+{
+public:
+    virtual ~wxFilterClassFactory() { }
+
+    virtual wxFilterInputStream  *NewStream(wxInputStream& stream)  const = 0;
+    virtual wxFilterOutputStream *NewStream(wxOutputStream& stream) const = 0;
+    virtual wxFilterInputStream  *NewStream(wxInputStream *stream)  const = 0;
+    virtual wxFilterOutputStream *NewStream(wxOutputStream *stream) const = 0;
+
+    static const wxFilterClassFactory *Find(const wxString& protocol,
+                                            wxStreamProtocolType type
+                                            = wxSTREAM_PROTOCOL);
+
+    static const wxFilterClassFactory *GetFirst();
+    const wxFilterClassFactory *GetNext() const { return m_next; }
+
+    void PushFront() { Remove(); m_next = sm_first; sm_first = this; }
+    void Remove();
+
+protected:
+    wxFilterClassFactory() : m_next(this) { }
+
+    wxFilterClassFactory& operator=(const wxFilterClassFactory&)
+        { return *this; }
+
+private:
+    static wxFilterClassFactory *sm_first;
+    wxFilterClassFactory *m_next;
+
+    DECLARE_ABSTRACT_CLASS(wxFilterClassFactory)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -356,7 +416,23 @@ public:
         read_write
     };
 
         read_write
     };
 

-    wxStreamBuffer(wxStreamBase& stream, BufMode mode);
+    wxStreamBuffer(wxStreamBase& stream, BufMode mode)
+    {
+        InitWithStream(stream, mode);
+    }
+
+    wxStreamBuffer(size_t bufsize, wxInputStream& stream)
+    {
+        InitWithStream(stream, read);
+        SetBufferIO(bufsize);
+    }
+
+    wxStreamBuffer(size_t bufsize, wxOutputStream& stream)
+    {
+        InitWithStream(stream, write);
+        SetBufferIO(bufsize);
+    }
+

     wxStreamBuffer(const wxStreamBuffer& buf);
     virtual ~wxStreamBuffer();
 
     wxStreamBuffer(const wxStreamBuffer& buf);
     virtual ~wxStreamBuffer();
 


@@ -374,6 +450,7 @@ public:
 
     // Buffer control
     void ResetBuffer();
 
     // Buffer control
     void ResetBuffer();

+    void Truncate();

 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
     //     true as it will be deallocated by free()
 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
     //     true as it will be deallocated by free()


@@ -383,7 +460,7 @@ public:
     void *GetBufferStart() const { return m_buffer_start; }
     void *GetBufferEnd() const { return m_buffer_end; }
     void *GetBufferPos() const { return m_buffer_pos; }
     void *GetBufferStart() const { return m_buffer_start; }
     void *GetBufferEnd() const { return m_buffer_end; }
     void *GetBufferPos() const { return m_buffer_pos; }

-    size_t GetBufferSize() const { return m_buffer_size; }
+    size_t GetBufferSize() const { return m_buffer_end - m_buffer_start; }

     size_t GetIntPosition() const { return m_buffer_pos - m_buffer_start; }
     void SetIntPosition(size_t pos) { m_buffer_pos = m_buffer_start + pos; }
     size_t GetLastAccess() const { return m_buffer_end - m_buffer_start; }
     size_t GetIntPosition() const { return m_buffer_pos - m_buffer_start; }
     void SetIntPosition(size_t pos) { m_buffer_pos = m_buffer_start + pos; }
     size_t GetLastAccess() const { return m_buffer_end - m_buffer_start; }


@@ -398,7 +475,7 @@ public:
 
     // misc accessors
     wxStreamBase *GetStream() const { return m_stream; }
 
     // misc accessors
     wxStreamBase *GetStream() const { return m_stream; }

-    bool HasBuffer() const { return m_buffer_size != 0; }
+    bool HasBuffer() const { return m_buffer_start != m_buffer_end; }

 
     bool IsFixed() const { return m_fixed; }
     bool IsFlushable() const { return m_flushable; }
 
     bool IsFixed() const { return m_fixed; }
     bool IsFlushable() const { return m_flushable; }


@@ -407,8 +484,10 @@ public:
     wxInputStream *GetInputStream() const;
     wxOutputStream *GetOutputStream() const;
 
     wxInputStream *GetInputStream() const;
     wxOutputStream *GetOutputStream() const;
 

+#if WXWIN_COMPATIBILITY_2_6

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

-    wxStreamBase *Stream() { return m_stream; }
+    wxDEPRECATED( wxStreamBase *Stream() );
+#endif // WXWIN_COMPATIBILITY_2_6

 
     // this constructs a dummy wxStreamBuffer, used by (and exists for)
     // wxMemoryStreams only, don't use!
 
     // this constructs a dummy wxStreamBuffer, used by (and exists for)
     // wxMemoryStreams only, don't use!


@@ -424,6 +503,9 @@ protected:
     // common part of several ctors
     void Init();
 
     // common part of several ctors
     void Init();
 

+    // common part of ctors taking wxStreamBase parameter
+    void InitWithStream(wxStreamBase& stream, BufMode mode);
+

     // init buffer variables to be empty
     void InitBuffer();
 
     // init buffer variables to be empty
     void InitBuffer();
 


@@ -436,10 +518,6 @@ protected:
          *m_buffer_end,
          *m_buffer_pos;
 
          *m_buffer_end,
          *m_buffer_pos;
 

-    // the buffer size
-    // FIXME: isn't it the same as m_buffer_end - m_buffer_start? (VZ)
-    size_t m_buffer_size;
-

     // the stream we're associated with
     wxStreamBase *m_stream;
 
     // the stream we're associated with
     wxStreamBase *m_stream;
 


@@ -451,13 +529,8 @@ protected:
          m_fixed,
          m_flushable;
 
          m_fixed,
          m_flushable;
 

-private:
-// Cannot use
-//  DECLARE_NO_COPY_CLASS(wxStreamBuffer)
-// because copy constructor is explicitly declared above;
-// but no copy assignment operator is defined, so declare
-// it private to prevent the compiler from defining it:
-    wxStreamBuffer& operator=(const wxStreamBuffer&);
+
+    wxDECLARE_NO_ASSIGN_CLASS(wxStreamBuffer);

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -467,9 +540,19 @@ private:
 class WXDLLIMPEXP_BASE wxBufferedInputStream : public wxFilterInputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxBufferedInputStream : public wxFilterInputStream
 {
 public:

-    // if a non NULL buffer is given to the stream, it will be deleted by it
+    // create a buffered stream on top of the specified low-level stream
+    //
+    // if a non NULL buffer is given to the stream, it will be deleted by it,
+    // otherwise a default 1KB buffer will be used

     wxBufferedInputStream(wxInputStream& stream,
                           wxStreamBuffer *buffer = NULL);
     wxBufferedInputStream(wxInputStream& stream,
                           wxStreamBuffer *buffer = NULL);

+
+    // ctor allowing to specify the buffer size, it's just a more convenient
+    // alternative to creating wxStreamBuffer, calling its SetBufferIO(bufsize)
+    // and using the ctor above
+    wxBufferedInputStream(wxInputStream& stream, size_t bufsize);
+
+

     virtual ~wxBufferedInputStream();
 
     char Peek();
     virtual ~wxBufferedInputStream();
 
     char Peek();


@@ -478,13 +561,16 @@ public:
     // Position functions
     wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart);
     wxFileOffset TellI() const;
     // Position functions
     wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart);
     wxFileOffset TellI() const;

+    bool IsSeekable() const { return m_parent_i_stream->IsSeekable(); }

 
     // the buffer given to the stream will be deleted by it
     void SetInputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
 
     // the buffer given to the stream will be deleted by it
     void SetInputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

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

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

 
 protected:
     virtual size_t OnSysRead(void *buffer, size_t bufsize);
 
 protected:
     virtual size_t OnSysRead(void *buffer, size_t bufsize);


@@ -493,7 +579,7 @@ protected:
 
     wxStreamBuffer *m_i_streambuf;
 
 
     wxStreamBuffer *m_i_streambuf;
 

-    DECLARE_NO_COPY_CLASS(wxBufferedInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedInputStream);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -503,9 +589,18 @@ protected:
 class WXDLLIMPEXP_BASE wxBufferedOutputStream : public wxFilterOutputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxBufferedOutputStream : public wxFilterOutputStream
 {
 public:

-    // if a non NULL buffer is given to the stream, it will be deleted by it
+    // create a buffered stream on top of the specified low-level stream
+    //
+    // if a non NULL buffer is given to the stream, it will be deleted by it,
+    // otherwise a default 1KB buffer will be used

     wxBufferedOutputStream(wxOutputStream& stream,
                            wxStreamBuffer *buffer = NULL);
     wxBufferedOutputStream(wxOutputStream& stream,
                            wxStreamBuffer *buffer = NULL);

+
+    // ctor allowing to specify the buffer size, it's just a more convenient
+    // alternative to creating wxStreamBuffer, calling its SetBufferIO(bufsize)
+    // and using the ctor above
+    wxBufferedOutputStream(wxOutputStream& stream, size_t bufsize);
+

     virtual ~wxBufferedOutputStream();
 
     wxOutputStream& Write(const void *buffer, size_t size);
     virtual ~wxBufferedOutputStream();
 
     wxOutputStream& Write(const void *buffer, size_t size);


@@ -513,8 +608,10 @@ public:
     // Position functions
     wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
     wxFileOffset TellO() const;
     // Position functions
     wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
     wxFileOffset TellO() const;

+    bool IsSeekable() const { return m_parent_o_stream->IsSeekable(); }

 
     void Sync();
 
     void Sync();

+    bool Close();

 
     wxFileOffset GetLength() const;
 
 
     wxFileOffset GetLength() const;
 


@@ -522,8 +619,10 @@ public:
     void SetOutputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 
     void SetOutputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

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

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

 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);


@@ -532,10 +631,15 @@ protected:
 
     wxStreamBuffer *m_o_streambuf;
 
 
     wxStreamBuffer *m_o_streambuf;
 

-    DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedOutputStream);

 };
 
 };
 

+#if WXWIN_COMPATIBILITY_2_6
+    inline wxStreamBase *wxStreamBuffer::Stream() { return m_stream; }
+    inline wxStreamBuffer *wxBufferedInputStream::InputStreamBuffer() const { return m_i_streambuf; }
+    inline wxStreamBuffer *wxBufferedOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
+#endif // WXWIN_COMPATIBILITY_2_6
+

 #endif // wxUSE_STREAMS
 
 #endif // _WX_WXSTREAM_H__
 #endif // wxUSE_STREAMS
 
 #endif // _WX_WXSTREAM_H__

-