X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1678ad780265f08fc8b84d180c04ae3a9900b1bb..6ec9d18f1b2c3d370190560e4cb5ba0997a2e778:/include/wx/zstream.h

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 76734083d2..9a4f11c6ad 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,52 +8,49 @@
 // 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/defs.h"
+
+#if wxUSE_ZLIB
+
 #include <wx/stream.h>
-#include "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 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 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
+
+#endif