wxStaticBitmapBase::DoGetBestSize

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 66be16c5df42343fa6c27ceffac6fffdb6641e3e..de88e07b56895d65ce6284e98e11d51d6cc24442 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -31,12 +31,14 @@ enum {
 
 // Flags
 enum {
 
 // Flags
 enum {

-    wxZLIB_NO_HEADER = 1   // required for use in Gzip and Zip files
+    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+

 };
 
 class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
  public:
 };
 
 class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
  public:

-  wxZlibInputStream(wxInputStream& stream, int flags = 0);
+  wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_ZLIB | wxZLIB_GZIP);

   virtual ~wxZlibInputStream();
 
   char Peek() { return wxInputStream::Peek(); }
   virtual ~wxZlibInputStream();
 
   char Peek() { return wxInputStream::Peek(); }


@@ -57,7 +59,7 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
 
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:
 
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:

-  wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = 0);
+  wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);

   virtual ~wxZlibOutputStream();
 
   void Sync() { DoFlush(false); }
   virtual ~wxZlibOutputStream();
 
   void Sync() { DoFlush(false); }