1. We don't need GetTopLevelParent() here, we already have wxGetTopLevelParent()

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 34bb20f6728f908bb532262efc0a0c2d33ba67d1..74ece7fb5b084ac85f146399cd8c0749b6f68fac 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -2,62 +2,95 @@
 // Name:        zstream.h
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Name:        zstream.h
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux

-// Modified by:
+// Modified by: Mike Wetherell

 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // 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 && wxUSE_STREAMS

 
 

-#include <wx/stream.h>
-#include "zlib.h"
+#include "wx/stream.h"

 
 

-class wxZlibInputStream: public wxFilterInputStream {
-  DECLARE_CLASS(wxZlibInputStream)
+// Compression level
+enum {
+    wxZ_DEFAULT_COMPRESSION = -1,
+    wxZ_NO_COMPRESSION = 0,
+    wxZ_BEST_SPEED = 1,
+    wxZ_BEST_COMPRESSION = 9
+};
+
+// Flags
+enum {
+#if WXWIN_COMPATIBILITY_2_4
+    wxZLIB_24COMPATIBLE = 4, // read v2.4.x data without error
+#endif
+    wxZLIB_NO_HEADER = 0,    // raw deflate stream, no header or checksum
+    wxZLIB_ZLIB = 1,         // zlib header and checksum
+    wxZLIB_GZIP = 2,         // gzip header and checksum, requires zlib 1.2.1+
+    wxZLIB_AUTO = 3          // autodetect header zlib or gzip
+};
+
+class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {

  public:
  public:

-  wxZlibInputStream(wxInputStream& stream);
+  wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO);

   virtual ~wxZlibInputStream();
 
   virtual ~wxZlibInputStream();
 

-  wxInputStream& Read(void *buffer, size_t size);
-  off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
-  off_t TellI() const;
+  char Peek() { return wxInputStream::Peek(); }
+  wxFileOffset GetLength() const { return wxInputStream::GetLength(); }

 
 

-  size_t LastRead() const { return m_lastread; }
-  bool Eof() const;
+  static bool CanHandleGZip();
+
+ protected:
+  size_t OnSysRead(void *buffer, size_t size);
+  wxFileOffset OnSysTell() const { return m_pos; }

 
  protected:
 
  protected:

-  size_t m_lastread;

   size_t m_z_size;
   unsigned char *m_z_buffer;
   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;
+  wxFileOffset m_pos;
+#if WXWIN_COMPATIBILITY_2_4
+  bool m_24compatibilty;
+#endif
+
+  DECLARE_NO_COPY_CLASS(wxZlibInputStream)

 };
 
 };
 

-class wxZlibOutputStream: public wxFilterOutputStream {
-  DECLARE_CLASS(wxZlibOutputStream)
+class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {

  public:
  public:

-  wxZlibOutputStream(wxOutputStream& stream);
-  virtual ~wxZlibOutputStream();
+  wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);
+  virtual ~wxZlibOutputStream() { Close(); }
+
+  void Sync() { DoFlush(false); }
+  bool Close();
+  wxFileOffset GetLength() const { return m_pos; }

 
 

-  wxOutputStream& Write(const void *buffer, size_t size);
-  off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
-  off_t TellO() const;
+  static bool CanHandleGZip();
+
+ protected:
+  size_t OnSysWrite(const void *buffer, size_t size);
+  wxFileOffset OnSysTell() const { return m_pos; }

 
 

-  size_t LastWrite() const { return m_lastwrite; }
-  bool Bad() const;
+  virtual void DoFlush(bool final);

 
  protected:
 
  protected:

-  size_t m_lastwrite;

   size_t m_z_size;
   unsigned char *m_z_buffer;
   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;
+  wxFileOffset m_pos;
+
+  DECLARE_NO_COPY_CLASS(wxZlibOutputStream)

 };
 
 #endif
 };
 
 #endif

+  // wxUSE_ZLIB && wxUSE_STREAMS
+
+#endif
+   // _WX_WXZSTREAM_H__
+