X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46dc76ba3573649a9ed7c7aff6dc677f533eee11..cba5a276e4821a0ae7d1e7a435d6aab38baa0a9f:/include/wx/zstream.h diff --git a/include/wx/zstream.h b/include/wx/zstream.h index 326058f3fb..2bbeb2fc52 100644 --- a/include/wx/zstream.h +++ b/include/wx/zstream.h @@ -8,52 +8,56 @@ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __WXZSTREAM_H__ -#define __WXZSTREAM_H__ +#ifndef _WX_WXZSTREAM_H__ +#define _WX_WXZSTREAM_H__ -#ifdef __GNUG__ -#pragma interface +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "zstream.h" #endif -#include -#include "../zlib/zlib.h" +#include "wx/defs.h" -class wxZlibInputStream: public wxFilterInputStream { +#if wxUSE_ZLIB && wxUSE_STREAMS + +#include "wx/stream.h" + +class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream { public: wxZlibInputStream(wxInputStream& stream); virtual ~wxZlibInputStream(); - bool Eof() const; - protected: - size_t DoRead(void *buffer, size_t size); - off_t DoSeekInput(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; } - off_t DoTellInput() const { return wxInvalidOffset; } + size_t OnSysRead(void *buffer, size_t size); protected: size_t m_z_size; unsigned char *m_z_buffer; - struct z_stream_s m_inflate; + struct z_stream_s *m_inflate; + + DECLARE_NO_COPY_CLASS(wxZlibInputStream) }; -class wxZlibOutputStream: public wxFilterOutputStream { +class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream { public: - wxZlibOutputStream(wxOutputStream& stream); + wxZlibOutputStream(wxOutputStream& stream, int level = -1); virtual ~wxZlibOutputStream(); void Sync(); - bool Bad() const; - protected: - size_t DoWrite(const void *buffer, size_t size); - off_t DoSeekOutput(off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) { return wxInvalidOffset; } - off_t DoTellOutput() const { return wxInvalidOffset; } + size_t OnSysWrite(const void *buffer, size_t size); protected: size_t m_z_size; unsigned char *m_z_buffer; - struct z_stream_s m_deflate; + struct z_stream_s *m_deflate; + + DECLARE_NO_COPY_CLASS(wxZlibOutputStream) }; #endif + // wxUSE_ZLIB && wxUSE_STREAMS + +#endif + // _WX_WXZSTREAM_H__ +