Remove selection methods taking int from generic wxDataViewCtrl.

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index cb2ba6c4fabe44d6fa8379daab9ff68839943dad..739a58e836bbf2c4c0a86b6592add67a910efdc0 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -19,6 +19,7 @@
 #if wxUSE_ZLIB && wxUSE_STREAMS
 
 #include "wx/zstream.h"
+#include "wx/versioninfo.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
@@ -44,6 +45,14 @@ enum {
 };
 
 
+wxVersionInfo wxGetZlibVersionInfo()
+{
+    return wxVersionInfo("zlib",
+                         ZLIB_VERNUM >> 12,
+                         (ZLIB_VERNUM >> 8) & 0x0F,
+                         (ZLIB_VERNUM & 0xFF) / 0x10);
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // Zlib Class factory
 
@@ -88,13 +97,13 @@ wxGzipClassFactory::wxGzipClassFactory()
 const wxChar * const *
 wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
 {
-    static const wxChar *protos[] =     
+    static const wxChar *protos[] =
         { wxT("gzip"), NULL };
-    static const wxChar *mimes[] =     
+    static const wxChar *mimes[] =
         { wxT("application/gzip"), wxT("application/x-gzip"), NULL };
-    static const wxChar *encs[] = 
+    static const wxChar *encs[] =
         { wxT("gzip"), NULL };
-    static const wxChar *exts[] =    
+    static const wxChar *exts[] =
         { wxT(".gz"), wxT(".gzip"), NULL };
     static const wxChar *empty[] =
         { NULL };
@@ -335,11 +344,8 @@ bool wxZlibOutputStream::Close()
  {
   DoFlush(true);
    deflateEnd(m_deflate);
-   delete m_deflate;
-
-  m_deflate = NULL;
-   delete[] m_z_buffer;
-  m_z_buffer = NULL;
+   wxDELETE(m_deflate);
+   wxDELETEA(m_z_buffer);
 
   return wxFilterOutputStream::Close() && IsOk();
  }