projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some "USE" defs that were missing.
[wxWidgets.git]
/
include
/
wx
/
zstream.h
diff --git
a/include/wx/zstream.h
b/include/wx/zstream.h
index addbcf06b99314d77511867ea0d532c338d63af2..fa65ee7f4e6207e34316c1cc81fae7f523072c1f 100644
(file)
--- a/
include/wx/zstream.h
+++ b/
include/wx/zstream.h
@@
-8,54
+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 "../../src/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();
- 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 {
+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
+ // wxUSE_ZLIB && wxUSE_STREAMS
+
+#endif
+ // _WX_WXZSTREAM_H__
+