GCC 4.0 (Apple 4059) is a little bit pickier than 3.3.

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 7086472a219794fd56959e29d42f38e45f86e642..16d43212e6d8062401ec489ca3226e275fbd1ae6 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -46,7 +46,7 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
   virtual ~wxZlibInputStream();
 
   char Peek() { return wxInputStream::Peek(); }
   virtual ~wxZlibInputStream();
 
   char Peek() { return wxInputStream::Peek(); }

-  size_t GetSize() const { return wxInputStream::GetSize(); }
+  wxFileOffset GetLength() const { return wxInputStream::GetLength(); }

 
   static bool CanHandleGZip();
 
 
   static bool CanHandleGZip();
 


@@ -69,10 +69,11 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
  public:
   wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);
 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); }
 
   void Sync() { DoFlush(false); }

-  size_t GetSize() const { return (size_t)m_pos; }
+  bool Close();
+  wxFileOffset GetLength() const { return m_pos; }

 
   static bool CanHandleGZip();
 
 
   static bool CanHandleGZip();