fixes to handling of the 7 bit ASCII encoding

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 9fec85d2a9bccbb57f2f49b828807aaddc70d339..3cac08f9459c9a67f05952a580201054a7e218ce 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,54 +8,52 @@
 // 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 "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();
 
-  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 OnSysRead(void *buffer, size_t size);
 
  protected:
-  size_t m_lastread;
   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 {
+class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
  public:
-  wxZlibOutputStream(wxOutputStream& stream);
+  wxZlibOutputStream(wxOutputStream& stream, int level = -1);
   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 OnSysWrite(const void *buffer, size_t size);
 
  protected:
-  size_t m_lastwrite;
   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
+  // wxUSE_ZLIB && wxUSE_STREAMS
+
+#endif
+   // _WX_WXZSTREAM_H__
+