X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a6944fd74cfb70ace96d60bde31a7c8e0a5896d..fbc535ff084f61ec376f339c515d96d74065c18b:/include/wx/zstream.h

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index addbcf06b9..65fa71c615 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,34 +8,31 @@
 // 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
 #endif
 
 #include <wx/stream.h>
-#include "../../src/zlib/zlib.h"
 
 class wxZlibInputStream: public wxFilterInputStream {
  public:
   wxZlibInputStream(wxInputStream& stream);
   virtual ~wxZlibInputStream();
 
-  wxInputStream& Read(void *buffer, size_t size);
-  off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
-  off_t TellI() const;
-
-  size_t LastRead() const { return m_lastread; }
   bool Eof() const;
 
  protected:
-  size_t m_lastread;
+  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; }
+
+ protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
-  bool m_eof;
-  struct z_stream_s m_inflate;
+  struct z_stream_s *m_inflate;
 };
 
 class wxZlibOutputStream: public wxFilterOutputStream {
@@ -43,19 +40,19 @@ class wxZlibOutputStream: public wxFilterOutputStream {
   wxZlibOutputStream(wxOutputStream& stream);
   virtual ~wxZlibOutputStream();
 
-  wxOutputStream& Write(const void *buffer, size_t size);
-  off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
-  off_t TellO() const;
+  void Sync();
 
-  size_t LastWrite() const { return m_lastwrite; }
   bool Bad() const;
 
  protected:
-  size_t m_lastwrite;
+  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; }
+
+ protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
-  bool m_bad;
-  struct z_stream_s m_deflate;
+  struct z_stream_s *m_deflate;
 };
 
 #endif