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 26ac4b14ab9f914f046a4722849c86a2b3df1319..165ea240d264471f0aef7e81e91b19322288a601 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -11,7 +11,7 @@
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 
 #ifndef _WX_WXZSTREAM_H__
 #define _WX_WXZSTREAM_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "zstream.h"
 #endif
 
 #pragma interface "zstream.h"
 #endif
 


@@ -21,7 +21,7 @@
 
 #include "wx/stream.h"
 
 
 #include "wx/stream.h"
 

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

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


@@ -37,7 +37,7 @@ class WXDLLEXPORT_BASE wxZlibInputStream: public wxFilterInputStream {
     DECLARE_NO_COPY_CLASS(wxZlibInputStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxZlibInputStream)
 };
 

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

  public:
   wxZlibOutputStream(wxOutputStream& stream, int level = -1);
   virtual ~wxZlibOutputStream();
  public:
   wxZlibOutputStream(wxOutputStream& stream, int level = -1);
   virtual ~wxZlibOutputStream();