#if wxUSE_ZLIB && wxUSE_STREAMS
#include "wx/zstream.h"
+#include "wx/versioninfo.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
// 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)
+#if defined(__WINDOWS__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
#include "../zlib/zlib.h"
#else
#include "zlib.h"
};
+wxVersionInfo wxGetZlibVersionInfo()
+{
+ int major,
+ minor,
+ build;
+
+ if ( sscanf(zlibVersion(), "%d.%d.%d", &major, &minor, &build) != 3 )
+ {
+ major =
+ minor =
+ build = 0;
+ }
+
+ return wxVersionInfo("zlib", major, minor, build);
+}
+
/////////////////////////////////////////////////////////////////////////////
// Zlib Class factory
{
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();
}