X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/678d9f2a42faa84cf934bbb75a5b4414a094012e..54a8f42b9d7111ab7ee7ccbcca8fcc6873906507:/src/common/zstream.cpp

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index bf1a80fd61..a50768c912 100644
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -29,10 +29,10 @@
 
 // When using configure, the path must be "zlib.h" I don't know
 // what other ports (wxMac, wxMotif without configure) need here.
-// If we are building with ./configure, we trust the zlib path is 
-// given as a -I option.
-#if defined(__WXMSW__) && !defined(HAVE_CONFIG_H)
-   #include "..\zlib\zlib.h"
+// If we are building with configure (defines __WX_SETUP_H__), 
+// we trust the zlib path is given as a -I option.
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__)
+   #include "../zlib/zlib.h"
 #else
    #include "zlib.h"
 #endif
@@ -138,7 +138,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {
-    wxLogDebug( _T("wxZlibOutputStream: an error occured while closing the stream.\n") );
+    wxLogDebug( wxT("wxZlibOutputStream: an error occured while closing the stream.\n") );
     return;
   }
 
@@ -160,6 +160,19 @@ void wxZlibOutputStream::Sync()
     return;
   }
 
+  // Fixed by "Stefan Csomor" <csomor@advancedconcepts.ch>
+  while( m_deflate->avail_out == 0 )
+  {
+     m_parent_o_stream->Write(m_z_buffer, m_z_size );
+     m_deflate->next_out  = m_z_buffer;
+     m_deflate->avail_out = m_z_size;
+     err = deflate(m_deflate, Z_FULL_FLUSH);
+     if (err != Z_OK) {
+        return;
+     }
+  }
+  // End
+
   m_parent_o_stream->Write(m_z_buffer, m_z_size-m_deflate->avail_out);
   m_deflate->next_out  = m_z_buffer;
   m_deflate->avail_out = m_z_size;