toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index c83d44a4de7fd4a5f755eed55ab4717bbb9350c3..2636efd14b5b04e66b0ac22249de7326d28f519f 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -33,10 +33,8 @@
 // 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"
 // 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"

-#elif defined(__WXMAC__) && defined(__UNIX__)
-   #include <Kernel/net/zlib.h>

 #else
 #else

-   #include <zlib.h>
+   #include "zlib.h"

 #endif
 
 #define ZSTREAM_BUFFER_SIZE 1024
 #endif
 
 #define ZSTREAM_BUFFER_SIZE 1024


@@ -159,6 +157,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   }
 
   deflateEnd(m_deflate);
   }
 
   deflateEnd(m_deflate);

+  delete m_deflate;

 
   delete[] m_z_buffer;
 }
 
   delete[] m_z_buffer;
 }