wxCursor(wxImage) added (Chris Elliott, patch 517439)

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 326058f3fb61502b14e7d1bf55b95362ad806390..3cac08f9459c9a67f05952a580201054a7e218ce 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,52 +8,52 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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
 
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 

-#include <wx/stream.h>
-#include "../zlib/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();
 
  public:
   wxZlibInputStream(wxInputStream& stream);
   virtual ~wxZlibInputStream();
 

-  bool Eof() const;
-

  protected:
  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;
 
  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:
  public:

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

   virtual ~wxZlibOutputStream();
 
   void Sync();
 
   virtual ~wxZlibOutputStream();
 
   void Sync();
 

-  bool Bad() const;
-

  protected:
  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;
 
  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

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