Partial Watcom C++ 10.6 support added (doesn't link for some reason)

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 34bb20f6728f908bb532262efc0a0c2d33ba67d1..cab4f71e07bd595adfd3d5ac30b9a9b27768e4b3 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,56 +8,43 @@
 // 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
 
 #include <wx/stream.h>
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include <wx/stream.h>

-#include "zlib.h"

 
 

-class wxZlibInputStream: public wxFilterInputStream {
-  DECLARE_CLASS(wxZlibInputStream)
+class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {

  public:
   wxZlibInputStream(wxInputStream& stream);
   virtual ~wxZlibInputStream();
 
  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:
 
  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;

 };
 
 };
 

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

  public:
   wxZlibOutputStream(wxOutputStream& stream);
   virtual ~wxZlibOutputStream();
 
  public:
   wxZlibOutputStream(wxOutputStream& stream);
   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:
 
  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;

 };
 
 #endif
 };
 
 #endif