X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55420742a101b2963c40694cb879ea3de4fb6bb2..a2580e1c491f912bcf86ead99859d69ab525ce2e:/include/wx/zstream.h diff --git a/include/wx/zstream.h b/include/wx/zstream.h index badb3e4f78..d6c473080b 100644 --- a/include/wx/zstream.h +++ b/include/wx/zstream.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: zstream.h +// Name: wx/zstream.h // Purpose: Memory stream classes // Author: Guilhem Lavaux // Modified by: Mike Wetherell @@ -18,7 +18,7 @@ #include "wx/stream.h" // Compression level -enum { +enum wxZlibCompressionLevels { wxZ_DEFAULT_COMPRESSION = -1, wxZ_NO_COMPRESSION = 0, wxZ_BEST_SPEED = 1, @@ -26,10 +26,7 @@ enum { }; // Flags -enum { -#if WXWIN_COMPATIBILITY_2_4 - wxZLIB_24COMPATIBLE = 4, // read v2.4.x data without error -#endif +enum wxZLibFlags { wxZLIB_NO_HEADER = 0, // raw deflate stream, no header or checksum wxZLIB_ZLIB = 1, // zlib header and checksum wxZLIB_GZIP = 2, // gzip header and checksum, requires zlib 1.2.1+ @@ -59,9 +56,6 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { unsigned char *m_z_buffer; struct z_stream_s *m_inflate; wxFileOffset m_pos; -#if WXWIN_COMPATIBILITY_2_4 - bool m_24compatibilty; -#endif DECLARE_NO_COPY_CLASS(wxZlibInputStream) };