remove confusing wxDialog::ButtonSizerFlags and extract button styles properly in...

[wxWidgets.git] / src / common / zstream.cpp

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 3dc3214091766560b5a8c0e4f984388958633f36..57bed6a6a35e7cb58560fcc61c1f23e41408e0e7 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -23,18 +23,18 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/utils.h"
 #endif
 
-#include "wx/utils.h"
 
 // normally, the compiler options should contain -I../zlib, but it is
 // apparently not the case for all MSW makefiles and so, unless we use
 // configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
 // the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
 #if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
-   #include "../zlib/zlib.h"
+    #include "../zlib/zlib.h"
 #else
-   #include "zlib.h"
+    #include "zlib.h"
 #endif
 
 enum {
@@ -43,25 +43,95 @@ enum {
     ZSTREAM_AUTO        = 0x20      // auto detect between gzip and zlib
 };
 
+
+/////////////////////////////////////////////////////////////////////////////
+// Zlib Class factory
+
+IMPLEMENT_DYNAMIC_CLASS(wxZlibClassFactory, wxFilterClassFactory)
+
+static wxZlibClassFactory g_wxZlibClassFactory;
+
+wxZlibClassFactory::wxZlibClassFactory()
+{
+    if (this == &g_wxZlibClassFactory)
+        PushFront();
+}
+
+const wxChar * const *
+wxZlibClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *mimes[] = { _T("application/x-deflate"), NULL };
+    static const wxChar *encs[] =  { _T("deflate"), NULL };
+    static const wxChar *empty[] = { NULL };
+
+    switch (type) {
+        case wxSTREAM_MIMETYPE:         return mimes;
+        case wxSTREAM_ENCODING:         return encs;
+        default:                        return empty;
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Gzip Class factory
+
+IMPLEMENT_DYNAMIC_CLASS(wxGzipClassFactory, wxFilterClassFactory)
+
+static wxGzipClassFactory g_wxGzipClassFactory;
+
+wxGzipClassFactory::wxGzipClassFactory()
+{
+    if (this == &g_wxGzipClassFactory && wxZlibInputStream::CanHandleGZip())
+        PushFront();
+}
+
+const wxChar * const *
+wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *protos[] =     
+        { _T("gzip"), NULL };
+    static const wxChar *mimes[] =     
+        { _T("application/gzip"), _T("application/x-gzip"), NULL };
+    static const wxChar *encs[] = 
+        { _T("gzip"), NULL };
+    static const wxChar *exts[] =    
+        { _T(".gz"), _T(".gzip"), NULL };
+    static const wxChar *empty[] =
+        { NULL };
+
+    switch (type) {
+        case wxSTREAM_PROTOCOL: return protos;
+        case wxSTREAM_MIMETYPE: return mimes;
+        case wxSTREAM_ENCODING: return encs;
+        case wxSTREAM_FILEEXT:  return exts;
+        default:                return empty;
+    }
+}
+
+
 //////////////////////
 // wxZlibInputStream
 //////////////////////
 
 wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags)
   : wxFilterInputStream(stream)
+{
+    Init(flags);
+}
+
+wxZlibInputStream::wxZlibInputStream(wxInputStream *stream, int flags)
+  : wxFilterInputStream(stream)
+{
+    Init(flags);
+}
+
+void wxZlibInputStream::Init(int flags)
 {
   m_inflate = NULL;
   m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
   m_z_size = ZSTREAM_BUFFER_SIZE;
   m_pos = 0;
 
-#if WXWIN_COMPATIBILITY_2_4
-  // treat compatibility mode as auto
-  m_24compatibilty = flags == wxZLIB_24COMPATIBLE;
-  if (m_24compatibilty)
-    flags = wxZLIB_AUTO;
-#endif
-
   // if gzip is asked for but not supported...
   if ((flags == wxZLIB_GZIP || flags == wxZLIB_AUTO) && !CanHandleGZip()) {
     if (flags == wxZLIB_AUTO) {
@@ -154,11 +224,6 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
       // by the parent strean,
       m_lasterror = wxSTREAM_READ_ERROR;
       if (m_parent_i_stream->Eof())
-#if WXWIN_COMPATIBILITY_2_4
-        if (m_24compatibilty)
-          m_lasterror = wxSTREAM_EOF;
-        else
-#endif
           wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
       break;
 
@@ -183,6 +248,16 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
   return major > 1 || (major == 1 && minor >= 2);
 }
 
+bool wxZlibInputStream::SetDictionary(const char *data, const size_t datalen)
+{
+    return (inflateSetDictionary(m_inflate, (Bytef*)data, datalen) == Z_OK);
+}
+
+bool wxZlibInputStream::SetDictionary(const wxMemoryBuffer &buf)
+{
+    return SetDictionary((char*)buf.GetData(), buf.GetDataLen());
+}
+
 
 //////////////////////
 // wxZlibOutputStream
@@ -192,6 +267,19 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream,
                                        int level,
                                        int flags)
  : wxFilterOutputStream(stream)
+{
+    Init(level, flags);
+}
+
+wxZlibOutputStream::wxZlibOutputStream(wxOutputStream *stream,
+                                       int level,
+                                       int flags)
+ : wxFilterOutputStream(stream)
+{
+    Init(level, flags);
+}
+
+void wxZlibOutputStream::Init(int level, int flags)
 {
   m_deflate = NULL;
   m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
@@ -250,7 +338,8 @@ bool wxZlibOutputStream::Close()
   m_deflate = NULL;
    delete[] m_z_buffer;
   m_z_buffer = NULL;
-  return IsOk();
+
+  return wxFilterOutputStream::Close() && IsOk();
  }
 
 void wxZlibOutputStream::DoFlush(bool final)
@@ -333,5 +422,15 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
   return wxZlibInputStream::CanHandleGZip();
 }
 
+bool wxZlibOutputStream::SetDictionary(const char *data, const size_t datalen)
+{
+    return (deflateSetDictionary(m_deflate, (Bytef*)data, datalen) == Z_OK);
+}
+
+bool wxZlibOutputStream::SetDictionary(const wxMemoryBuffer &buf)
+{
+    return SetDictionary((char*)buf.GetData(), buf.GetDataLen());
+}
+
 #endif
   // wxUSE_ZLIB && wxUSE_STREAMS