X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..1e6d94998fcbdb3ce60774e38c0d4b6ee20c6798:/include/wx/zstream.h?ds=sidebyside

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 6d68c5fc75..cab4f71e07 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -16,44 +16,35 @@
 #endif
 
 #include <wx/stream.h>
-#include "../zlib/zlib.h"
 
-class wxZlibInputStream: public wxFilterInputStream {
+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;
 };
 
-class wxZlibOutputStream: public wxFilterOutputStream {
+class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
  public:
   wxZlibOutputStream(wxOutputStream& stream);
   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;
 };
 
 #endif