avoid a bug in Carbon headers

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

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 9538abcff6d018066e61a4dc2fd0e64d8d23613f..165ea240d264471f0aef7e81e91b19322288a601 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -11,17 +11,17 @@
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "zstream.h"

 #endif
 
 #include "wx/defs.h"
 
 #endif
 
 #include "wx/defs.h"
 

-#ifdef wxUSE_ZLIB
+#if wxUSE_ZLIB && wxUSE_STREAMS

 
 

-#include <wx/stream.h>
+#include "wx/stream.h"

 
 

-class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {
+class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {

  public:
   wxZlibInputStream(wxInputStream& stream);
   virtual ~wxZlibInputStream();
  public:
   wxZlibInputStream(wxInputStream& stream);
   virtual ~wxZlibInputStream();


@@ -33,11 +33,13 @@ class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;

+
+    DECLARE_NO_COPY_CLASS(wxZlibInputStream)

 };
 
 };
 

-class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
+class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {

  public:
  public:

-  wxZlibOutputStream(wxOutputStream& stream);
+  wxZlibOutputStream(wxOutputStream& stream, int level = -1);

   virtual ~wxZlibOutputStream();
 
   void Sync();
   virtual ~wxZlibOutputStream();
 
   void Sync();


@@ -49,8 +51,13 @@ class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_deflate;
   size_t m_z_size;
   unsigned char *m_z_buffer;
   struct z_stream_s *m_deflate;

+
+    DECLARE_NO_COPY_CLASS(wxZlibOutputStream)

 };
 
 #endif
 };
 
 #endif

+  // wxUSE_ZLIB && wxUSE_STREAMS

 
 #endif
 
 #endif

+   // _WX_WXZSTREAM_H__
+