projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.
[wxWidgets.git]
/
include
/
wx
/
zstream.h
diff --git
a/include/wx/zstream.h
b/include/wx/zstream.h
index 326058f3fb61502b14e7d1bf55b95362ad806390..1accc85d3c3d82dcf8a4f1e51c32c24edeb71067 100644
(file)
--- a/
include/wx/zstream.h
+++ b/
include/wx/zstream.h
@@
-8,32
+8,27
@@
// 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/zlib.h"
class wxZlibInputStream: public wxFilterInputStream {
public:
wxZlibInputStream(wxInputStream& stream);
virtual ~wxZlibInputStream();
class wxZlibInputStream: public wxFilterInputStream {
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 wxZlibOutputStream: public wxFilterOutputStream {
@@
-43,17
+38,13
@@
class wxZlibOutputStream: public wxFilterOutputStream {
void Sync();
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