added wxBG_STYLE_TRANSPARENT and implemented it for wxMac; documented various transpa...

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 6e8b1749f2803f07ea8b97db2e94f833871b7592..73522f1c3774a0d828ab63d1abf7f1115fe635c2 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(__APPLE__)
-#pragma interface "stream.h"
-#endif
-

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


@@ -23,16 +19,16 @@
 #include <stdio.h>
 #include "wx/object.h"
 #include "wx/string.h"
 #include <stdio.h>
 #include "wx/object.h"
 #include "wx/string.h"

-#include "wx/filefn.h"  // for off_t, wxInvalidOffset and wxSeekMode
+#include "wx/filefn.h"  // for wxFileOffset, wxInvalidOffset and wxSeekMode

 
 

-class WXDLLEXPORT wxStreamBase;
-class WXDLLEXPORT wxInputStream;
-class WXDLLEXPORT 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&);
 

-WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
+WXDLLIMPEXP_BASE wxOutputStream& wxEndL(wxOutputStream& o_stream);

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -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 WXDLLEXPORT wxStreamBase
+class WXDLLIMPEXP_BASE wxStreamBase : public wxObject

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


@@ -75,30 +60,29 @@ 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
     void Reset() { m_lasterror = wxSTREAM_NO_ERROR; }
 
     bool operator!() const { return !IsOk(); }
 
     // reset the stream state
     void Reset() { m_lasterror = wxSTREAM_NO_ERROR; }
 

-    // deprecated (doesn't make sense!), don't use
-    virtual size_t GetSize() const { return 0; }
+    // this doesn't make sense for all streams, always test its return value
+    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:
 
 protected:

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

 
     size_t m_lastcount;
     wxStreamError m_lasterror;
 
     friend class wxStreamBuffer;
 
 
     size_t m_lastcount;
     wxStreamError m_lasterror;
 
     friend class wxStreamBuffer;
 

+    DECLARE_ABSTRACT_CLASS(wxStreamBase)

     DECLARE_NO_COPY_CLASS(wxStreamBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxStreamBase)
 };
 


@@ -106,7 +90,7 @@ protected:
 // wxInputStream: base class for the input streams
 // ----------------------------------------------------------------------------
 
 // wxInputStream: base class for the input streams
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxInputStream : public wxStreamBase
+class WXDLLIMPEXP_BASE wxInputStream : public wxStreamBase

 {
 public:
     // ctor and dtor, nothing exciting
 {
 public:
     // ctor and dtor, nothing exciting


@@ -125,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
     //


@@ -159,7 +143,7 @@ public:
     // all the requested data or not
     virtual size_t LastRead() const { return wxStreamBase::m_lastcount; }
 
     // all the requested data or not
     virtual size_t LastRead() const { return wxStreamBase::m_lastcount; }
 

-    // returns TRUE if some data is available in the stream right now, so that
+    // returns true if some data is available in the stream right now, so that

     // calling Read() wouldn't block
     virtual bool CanRead() const;
 
     // calling Read() wouldn't block
     virtual bool CanRead() const;
 


@@ -181,7 +165,7 @@ public:
 
     // put back the specified character in the stream
     //
 
     // put back the specified character in the stream
     //

-    // returns TRUE if ok, FALSE on error
+    // returns true if ok, false on error

     bool Ungetch(char c);
 
 
     bool Ungetch(char c);
 
 


@@ -192,10 +176,10 @@ public:
     // it)
     //
     // returns wxInvalidOffset on error
     // it)
     //
     // returns wxInvalidOffset on error

-    virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
+    virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart);

 
     // return the current position of the stream pointer or wxInvalidOffset
 
     // return the current position of the stream pointer or wxInvalidOffset

-    virtual off_t TellI() const;
+    virtual wxFileOffset TellI() const;

 
 
     // stream-like operators
 
 
     // stream-like operators


@@ -207,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;


@@ -232,13 +216,16 @@ protected:
     size_t m_wbackcur;
 
     friend class wxStreamBuffer;
     size_t m_wbackcur;
 
     friend class wxStreamBuffer;

+
+    DECLARE_ABSTRACT_CLASS(wxInputStream)
+    DECLARE_NO_COPY_CLASS(wxInputStream)

 };
 
 // ----------------------------------------------------------------------------
 // wxOutputStream: base for the output streams
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxOutputStream: base for the output streams
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxOutputStream();
 {
 public:
     wxOutputStream();


@@ -248,12 +235,13 @@ public:
     virtual wxOutputStream& Write(const void *buffer, size_t size);
     wxOutputStream& Write(wxInputStream& stream_in);
 
     virtual wxOutputStream& Write(const void *buffer, size_t size);
     wxOutputStream& Write(wxInputStream& stream_in);
 

-    virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
-    virtual off_t TellO() const;
+    virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
+    virtual wxFileOffset TellO() const;

 
     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); }


@@ -264,6 +252,9 @@ protected:
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
 
     friend class wxStreamBuffer;
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
 
     friend class wxStreamBuffer;

+
+    DECLARE_ABSTRACT_CLASS(wxOutputStream)
+    DECLARE_NO_COPY_CLASS(wxOutputStream)

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


@@ -274,62 +265,138 @@ protected:
 // A stream for measuring streamed output
 // ---------------------------------------------------------------------------
 
 // A stream for measuring streamed output
 // ---------------------------------------------------------------------------
 

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

 {
 public:
     wxCountingOutputStream();
 
 {
 public:
     wxCountingOutputStream();
 

-    size_t GetSize() const;
-    bool Ok() const { return TRUE; }
+    wxFileOffset GetLength() const;
+    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);

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

 
     size_t m_currentPos;
 
     size_t m_currentPos;

+
+    DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
+    DECLARE_NO_COPY_CLASS(wxCountingOutputStream)

 };
 
 // ---------------------------------------------------------------------------
 // "Filter" streams
 // ---------------------------------------------------------------------------
 
 };
 
 // ---------------------------------------------------------------------------
 // "Filter" streams
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFilterInputStream : public wxInputStream
+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(); }
 

-    size_t GetSize() const { return m_parent_i_stream->GetSize(); }
+    wxFileOffset GetLength() const { return m_parent_i_stream->GetLength(); }

 
     wxInputStream *GetFilterInputStream() const { return m_parent_i_stream; }
 
 protected:
     wxInputStream *m_parent_i_stream;
 
     wxInputStream *GetFilterInputStream() const { return m_parent_i_stream; }
 
 protected:
     wxInputStream *m_parent_i_stream;

+    bool m_owns;

 
 

+    DECLARE_ABSTRACT_CLASS(wxFilterInputStream)

     DECLARE_NO_COPY_CLASS(wxFilterInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFilterInputStream)
 };
 

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

 {
 public:
     wxFilterOutputStream();
     wxFilterOutputStream(wxOutputStream& stream);
 {
 public:
     wxFilterOutputStream();
     wxFilterOutputStream(wxOutputStream& stream);

+    wxFilterOutputStream(wxOutputStream *stream);

     virtual ~wxFilterOutputStream();
 
     virtual ~wxFilterOutputStream();
 

-    size_t GetSize() const { return m_parent_o_stream->GetSize(); }
+    wxFileOffset GetLength() const { return m_parent_o_stream->GetLength(); }

 
     wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; }
 
 
     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)

     DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
 };
 
     DECLARE_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() { }
+
+    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)
+};
+

 // ============================================================================
 // buffered streams
 // ============================================================================
 // ============================================================================
 // buffered streams
 // ============================================================================


@@ -339,7 +406,7 @@ protected:
 // wxBufferedStreams to implement custom buffering
 // ---------------------------------------------------------------------------
 
 // wxBufferedStreams to implement custom buffering
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStreamBuffer
+class WXDLLIMPEXP_BASE wxStreamBuffer

 {
 public:
     enum BufMode
 {
 public:
     enum BufMode


@@ -362,16 +429,17 @@ public:
     virtual char Peek();
     virtual char GetChar();
     virtual void PutChar(char c);
     virtual char Peek();
     virtual char GetChar();
     virtual void PutChar(char c);

-    virtual off_t Tell() const;
-    virtual off_t Seek(off_t pos, wxSeekMode mode);
+    virtual wxFileOffset Tell() const;
+    virtual wxFileOffset Seek(wxFileOffset pos, wxSeekMode mode);

 
     // Buffer control
     void ResetBuffer();
 
     // Buffer control
     void ResetBuffer();

+    void Truncate();

 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
 
     // NB: the buffer must always be allocated with malloc() if takeOwn is

-    //     TRUE as it will be deallocated by free()
-    void SetBufferIO(void *start, void *end, bool takeOwnership = FALSE);
-    void SetBufferIO(void *start, size_t len, bool takeOwnership = FALSE);
+    //     true as it will be deallocated by free()
+    void SetBufferIO(void *start, void *end, bool takeOwnership = false);
+    void SetBufferIO(void *start, size_t len, bool takeOwnership = false);

     void SetBufferIO(size_t bufsize);
     void *GetBufferStart() const { return m_buffer_start; }
     void *GetBufferEnd() const { return m_buffer_end; }
     void SetBufferIO(size_t bufsize);
     void *GetBufferStart() const { return m_buffer_start; }
     void *GetBufferEnd() const { return m_buffer_end; }


@@ -400,8 +468,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!


@@ -457,7 +527,7 @@ private:
 // wxBufferedInputStream
 // ---------------------------------------------------------------------------
 
 // wxBufferedInputStream
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBufferedInputStream : public wxFilterInputStream
+class WXDLLIMPEXP_BASE wxBufferedInputStream : public wxFilterInputStream

 {
 public:
     // if a non NULL buffer is given to the stream, it will be deleted by it
 {
 public:
     // if a non NULL buffer is given to the stream, it will be deleted by it


@@ -469,20 +539,23 @@ public:
     wxInputStream& Read(void *buffer, size_t size);
 
     // Position functions
     wxInputStream& Read(void *buffer, size_t size);
 
     // Position functions

-    off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
-    off_t TellI() const;
+    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);

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

 
     wxStreamBuffer *m_i_streambuf;
 
 
     wxStreamBuffer *m_i_streambuf;
 


@@ -493,7 +566,7 @@ protected:
 // wxBufferedOutputStream
 // ----------------------------------------------------------------------------
 
 // wxBufferedOutputStream
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBufferedOutputStream : public wxFilterOutputStream
+class WXDLLIMPEXP_BASE wxBufferedOutputStream : public wxFilterOutputStream

 {
 public:
     // if a non NULL buffer is given to the stream, it will be deleted by it
 {
 public:
     // if a non NULL buffer is given to the stream, it will be deleted by it


@@ -504,31 +577,40 @@ public:
     wxOutputStream& Write(const void *buffer, size_t size);
 
     // Position functions
     wxOutputStream& Write(const void *buffer, size_t size);
 
     // Position functions

-    off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
-    off_t TellO() const;
+    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();

 
 

-    size_t GetSize() const;
+    wxFileOffset GetLength() const;

 
     // the buffer given to the stream will be deleted by it
     void SetOutputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 
 
     // the buffer given to the stream will be deleted by it
     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);

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

 
     wxStreamBuffer *m_o_streambuf;
 
     DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
 };
 
 
     wxStreamBuffer *m_o_streambuf;
 
     DECLARE_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__

-