gtk_window_[un]fullscreen only available with GTK >= 2.2

[wxWidgets.git] / include / wx / zstream.h

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 748abd7b47ea0b78be58d5908adb7e93bd6ef62c..16d43212e6d8062401ec489ca3226e275fbd1ae6 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -46,19 +46,19 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
   virtual ~wxZlibInputStream();
 
   char Peek() { return wxInputStream::Peek(); }
-  size_t GetSize() const { return wxInputStream::GetSize(); }
+  wxFileOffset GetLength() const { return wxInputStream::GetLength(); }
 
   static bool CanHandleGZip();
 
  protected:
   size_t OnSysRead(void *buffer, size_t size);
-  off_t OnSysTell() const { return m_pos; }
+  wxFileOffset OnSysTell() const { return m_pos; }
 
  protected:
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;
-  off_t m_pos;
+  wxFileOffset m_pos;
 #if WXWIN_COMPATIBILITY_2_4
   bool m_24compatibilty;
 #endif
@@ -69,16 +69,17 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:
   wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);
-  virtual ~wxZlibOutputStream();
+  virtual ~wxZlibOutputStream() { Close(); }
 
   void Sync() { DoFlush(false); }
-  size_t GetSize() const { return (size_t)m_pos; }
+  bool Close();
+  wxFileOffset GetLength() const { return m_pos; }
 
   static bool CanHandleGZip();
 
  protected:
   size_t OnSysWrite(const void *buffer, size_t size);
-  off_t OnSysTell() const { return m_pos; }
+  wxFileOffset OnSysTell() const { return m_pos; }
 
   virtual void DoFlush(bool final);
 
@@ -86,7 +87,7 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_deflate;
-  off_t m_pos;
+  wxFileOffset m_pos;
 
   DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
 };