Reneabled inlining, but kept warnings disabled....

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 3cac08f9459c9a67f05952a580201054a7e218ce..66be16c5df42343fa6c27ceffac6fffdb6641e3e 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -2,7 +2,7 @@
 // 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
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux


@@ -11,8 +11,8 @@
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "zstream.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -21,34 +21,61 @@
 
 #include "wx/stream.h"
 
 
 #include "wx/stream.h"
 

-class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {
+// Compression level
+enum {
+    wxZ_DEFAULT_COMPRESSION = -1,
+    wxZ_NO_COMPRESSION = 0,
+    wxZ_BEST_SPEED = 1,
+    wxZ_BEST_COMPRESSION = 9
+};
+
+// Flags
+enum {
+    wxZLIB_NO_HEADER = 1   // required for use in Gzip and Zip files
+};
+
+class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {

  public:
  public:

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

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

+  char Peek() { return wxInputStream::Peek(); }
+  size_t GetSize() const { return wxInputStream::GetSize(); }
+

  protected:
   size_t OnSysRead(void *buffer, size_t size);
  protected:
   size_t OnSysRead(void *buffer, size_t size);

+  off_t OnSysTell() const { return m_pos; }

 
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;
 
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;

+  off_t m_pos;
+
+    DECLARE_NO_COPY_CLASS(wxZlibInputStream)

 };
 
 };
 

-class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
+class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {

  public:
  public:

-  wxZlibOutputStream(wxOutputStream& stream, int level = -1);
+  wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = 0);

   virtual ~wxZlibOutputStream();
 
   virtual ~wxZlibOutputStream();
 

-  void Sync();
+  void Sync() { DoFlush(false); }
+  size_t GetSize() const { return (size_t)m_pos; }

 
  protected:
   size_t OnSysWrite(const void *buffer, size_t size);
 
  protected:
   size_t OnSysWrite(const void *buffer, size_t size);

+  off_t OnSysTell() const { return m_pos; }
+
+  virtual void DoFlush(bool final);

 
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_deflate;
 
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_deflate;

+  off_t m_pos;
+
+    DECLARE_NO_COPY_CLASS(wxZlibOutputStream)

 };
 
 #endif
 };
 
 #endif