doc view code inteprets wxSTREAM_EOF as correct,

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 65fa71c6153f530096de238dd913c57c8691f0cd..fa65ee7f4e6207e34316c1cc81fae7f523072c1f 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -15,19 +15,19 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include <wx/stream.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;
 
  protected:
   size_t m_z_size;


@@ -35,19 +35,15 @@ class wxZlibInputStream: public wxFilterInputStream {
   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);
   virtual ~wxZlibOutputStream();
 
   void Sync();
 
  public:
   wxZlibOutputStream(wxOutputStream& stream);
   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;
 
  protected:
   size_t m_z_size;


@@ -56,3 +52,8 @@ class wxZlibOutputStream: public wxFilterOutputStream {
 };
 
 #endif
 };
 
 #endif

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