1. wxFrame::IsIconized() fixed - seems to work

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 4e896e2fd890b395198ebdceb2c88ca9785bc4ba..e0285c9db14483abf93fbfc2dfab249391d6322f 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -8,6 +8,7 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+

 #ifdef __GNUG__
 #pragma implementation "zstream.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "zstream.h"
 #endif


@@ -15,17 +16,25 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/zstream.h"
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif

 
 

-#if wxUSE_ZLIB
+#if wxUSE_ZLIB && wxUSE_STREAMS

 
 

+#include "wx/zstream.h"

 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"

-#include "../zlib/zlib.h"   // don't change this, Robert

 
 

-#ifdef __BORLANDC__
-#pragma hdrstop
+// 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"
+#else
+   #include <zlib.h>

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


@@ -40,8 +49,6 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream)
   int err;
 
   // I need a private stream buffer.
   int err;
 
   // I need a private stream buffer.

-  m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
-  m_i_destroybuf = TRUE;

   m_inflate = new z_stream_s;
 
   m_inflate->zalloc = (alloc_func)0;
   m_inflate = new z_stream_s;
 
   m_inflate->zalloc = (alloc_func)0;


@@ -78,39 +85,51 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
   while (m_inflate->avail_out > 0) {
     if (m_inflate->avail_in == 0) {
 
   while (m_inflate->avail_out > 0) {
     if (m_inflate->avail_in == 0) {
 

-      m_parent_i_stream->Read(m_z_buffer, m_z_size);
+      m_parent_i_stream->Read(m_z_buffer, wxMin(m_z_size, size));

       m_inflate->next_in = m_z_buffer;
       m_inflate->avail_in = m_parent_i_stream->LastRead();
 
       m_inflate->next_in = m_z_buffer;
       m_inflate->avail_in = m_parent_i_stream->LastRead();
 

-      if (m_parent_i_stream->LastError() != wxStream_NOERROR)
-        return (size - m_inflate->avail_in);
+      if (m_parent_i_stream->LastError() != wxStream_NOERROR &&
+          m_parent_i_stream->LastError() != wxStream_EOF)
+      { 
+        m_lasterror = m_parent_i_stream->LastError();
+        return 0; // failed to read anything
+      }
+
+      if ( m_inflate->avail_in == 0 )
+      {
+          // EOF
+          m_lasterror = wxStream_EOF;
+          break;
+      }

     }
     err = inflate(m_inflate, Z_FINISH);
     if (err == Z_STREAM_END)
     }
     err = inflate(m_inflate, Z_FINISH);
     if (err == Z_STREAM_END)

-      return (size - m_inflate->avail_in);
+      return (size - m_inflate->avail_out);

   }
 
   }
 

-  return size-m_inflate->avail_in;
+  return size-m_inflate->avail_out;

 }
 
 //////////////////////
 // wxZlibOutputStream
 //////////////////////
 
 }
 
 //////////////////////
 // wxZlibOutputStream
 //////////////////////
 

-wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
+wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream, int level)

  : wxFilterOutputStream(stream)
 {
   int err;
 
  : wxFilterOutputStream(stream)
 {
   int err;
 

-  m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
-  m_o_destroybuf = TRUE;

   m_deflate = new z_stream_s;
 
   m_deflate->zalloc = (alloc_func)0;
   m_deflate->zfree = (free_func)0;
   m_deflate->opaque = (voidpf)0;
 
   m_deflate = new z_stream_s;
 
   m_deflate->zalloc = (alloc_func)0;
   m_deflate->zfree = (free_func)0;
   m_deflate->opaque = (voidpf)0;
 

-  err = deflateInit(m_deflate, Z_DEFAULT_COMPRESSION);
+  if (level == -1) level = Z_DEFAULT_COMPRESSION;
+  wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!"));
+
+  err = deflateInit(m_deflate, level);

   if (err != Z_OK) {
     deflateEnd(m_deflate);
     return;
   if (err != Z_OK) {
     deflateEnd(m_deflate);
     return;


@@ -133,7 +152,7 @@ wxZlibOutputStream::~wxZlibOutputStream()
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {
   err = deflate(m_deflate, Z_FINISH);
   if (err != Z_STREAM_END) 
   {

-    wxLogDebug( "wxZlibOutputStream: an error occured while closing the stream.\n" );
+    wxLogDebug( wxT("wxZlibOutputStream: an error occured while closing the stream.\n") );

     return;
   }
 
     return;
   }
 


@@ -155,6 +174,19 @@ void wxZlibOutputStream::Sync()
     return;
   }
 
     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;
   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;


@@ -186,6 +218,5 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
 }
 
 #endif
 }
 
 #endif

-
-  // wxUSE_ZLIB
+  // wxUSE_ZLIB && wxUSE_STREAMS