Some stubs includes removed from wxMotif; wxNotebook sample hack to make it display;

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

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index fd1dc1062f655601376f3b85db6191d29dc34d8f..110199eda6d184c0cce196e1efdb162b770cd4b3 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -18,6 +18,7 @@
 #include <wx/zstream.h>
 #include <wx/utils.h>
 #include <wx/intl.h>
 #include <wx/zstream.h>
 #include <wx/utils.h>
 #include <wx/intl.h>

+#include "wx/log.h"

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


@@ -36,7 +37,7 @@ 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);
+  m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);

   m_i_destroybuf = TRUE;
   m_inflate = new z_stream_s;
 
   m_i_destroybuf = TRUE;
   m_inflate = new z_stream_s;
 


@@ -64,7 +65,7 @@ wxZlibInputStream::~wxZlibInputStream()
   delete m_inflate;
 }
 
   delete m_inflate;
 }
 

-size_t wxZlibInputStream::DoRead(void *buffer, size_t size)
+size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)

 {
   int err;
 
 {
   int err;
 


@@ -78,7 +79,7 @@ size_t wxZlibInputStream::DoRead(void *buffer, size_t 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->Eof())
+      if (m_parent_i_stream->LastError() != wxStream_NOERROR)

         return (size - m_inflate->avail_in);
     }
     err = inflate(m_inflate, Z_FINISH);
         return (size - m_inflate->avail_in);
     }
     err = inflate(m_inflate, Z_FINISH);


@@ -89,13 +90,6 @@ size_t wxZlibInputStream::DoRead(void *buffer, size_t size)
   return size-m_inflate->avail_in;
 }
 
   return size-m_inflate->avail_in;
 }
 

-bool wxZlibInputStream::Eof() const
-{
-  if (!m_eof)
-    return m_parent_i_stream->Eof();
-  return m_eof;
-}
-

 //////////////////////
 // wxZlibOutputStream
 //////////////////////
 //////////////////////
 // wxZlibOutputStream
 //////////////////////


@@ -105,7 +99,7 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream)
 {
   int err;
 
 {
   int err;
 

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

   m_o_destroybuf = TRUE;
   m_deflate = new z_stream_s;
 
   m_o_destroybuf = TRUE;
   m_deflate = new z_stream_s;
 


@@ -134,9 +128,9 @@ wxZlibOutputStream::~wxZlibOutputStream()
   Sync();
 
   err = deflate(m_deflate, Z_FINISH);
   Sync();
 
   err = deflate(m_deflate, Z_FINISH);

-  if (err != Z_STREAM_END) {
-    wxDebugMsg(_("wxZlibOutputStream: an error occured while we was closing "
-               "the stream.\n"));
+  if (err != Z_STREAM_END) 
+  {
+    wxLogDebug( "wxZlibOutputStream: an error occured while closing the stream.\n" );

     return;
   }
 
     return;
   }
 


@@ -155,7 +149,6 @@ void wxZlibOutputStream::Sync()
 
   err = deflate(m_deflate, Z_FULL_FLUSH);
   if (err != Z_OK) {
 
   err = deflate(m_deflate, Z_FULL_FLUSH);
   if (err != Z_OK) {

-    m_bad = TRUE;

     return;
   }
 
     return;
   }
 


@@ -164,7 +157,7 @@ void wxZlibOutputStream::Sync()
   m_deflate->avail_out = m_z_size;
 }
 
   m_deflate->avail_out = m_z_size;
 }
 

-size_t wxZlibOutputStream::DoWrite(const void *buffer, size_t size)
+size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)

 {
   int err;
 
 {
   int err;
 


@@ -175,7 +168,7 @@ size_t wxZlibOutputStream::DoWrite(const void *buffer, size_t size)
 
     if (m_deflate->avail_out == 0) {
       m_parent_o_stream->Write(m_z_buffer, m_z_size);
 
     if (m_deflate->avail_out == 0) {
       m_parent_o_stream->Write(m_z_buffer, m_z_size);

-      if (m_parent_o_stream->Bad())
+      if (m_parent_o_stream->LastError() != wxStream_NOERROR)

         return (size - m_deflate->avail_in);
 
       m_deflate->next_out = m_z_buffer;
         return (size - m_deflate->avail_in);
 
       m_deflate->next_out = m_z_buffer;


@@ -188,10 +181,3 @@ size_t wxZlibOutputStream::DoWrite(const void *buffer, size_t size)
   }
   return size;
 }
   }
   return size;
 }

-
-bool wxZlibOutputStream::Bad() const
-{
-  if (!m_bad)
-    return m_parent_o_stream->Bad();
-  return m_bad;
-}