X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/zstream.h?ds=sidebyside diff --git a/include/wx/zstream.h b/include/wx/zstream.h index fa3d534fe9..165ea240d2 100644 --- a/include/wx/zstream.h +++ b/include/wx/zstream.h @@ -11,7 +11,7 @@ #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 @@ -21,7 +21,7 @@ #include "wx/stream.h" -class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream { +class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream { public: wxZlibInputStream(wxInputStream& stream); virtual ~wxZlibInputStream(); @@ -33,9 +33,11 @@ class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream { 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: wxZlibOutputStream(wxOutputStream& stream, int level = -1); virtual ~wxZlibOutputStream(); @@ -49,6 +51,8 @@ class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream { size_t m_z_size; unsigned char *m_z_buffer; struct z_stream_s *m_deflate; + + DECLARE_NO_COPY_CLASS(wxZlibOutputStream) }; #endif