avoid a bug in Carbon headers

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 2fdae2f2e3ae0364be1a28172b431f02a388cd5a..c868ddb17b63b9ab871a3a43c903fc17cb1dddee 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXSTREAM_H__
 #define _WX_WXSTREAM_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "stream.h"
 #endif
 
@@ -25,14 +25,14 @@
 #include "wx/string.h"
 #include "wx/filefn.h"  // for off_t, wxInvalidOffset and wxSeekMode
 
-class WXDLLEXPORT_BASE wxStreamBase;
-class WXDLLEXPORT_BASE wxInputStream;
-class WXDLLEXPORT_BASE wxOutputStream;
+class WXDLLIMPEXP_BASE wxStreamBase;
+class WXDLLIMPEXP_BASE wxInputStream;
+class WXDLLIMPEXP_BASE wxOutputStream;
 
 typedef wxInputStream& (*__wxInputManip)(wxInputStream&);
 typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&);
 
-WXDLLEXPORT_BASE wxOutputStream& wxEndL(wxOutputStream& o_stream);
+WXDLLIMPEXP_BASE wxOutputStream& wxEndL(wxOutputStream& o_stream);
 
 // ----------------------------------------------------------------------------
 // constants
@@ -67,7 +67,7 @@ enum wxStreamError
 // wxStreamBase: common (but non virtual!) base for all stream classes
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxStreamBase
+class WXDLLIMPEXP_BASE wxStreamBase
 {
 public:
     wxStreamBase();
@@ -81,7 +81,7 @@ public:
     // reset the stream state
     void Reset() { m_lasterror = wxSTREAM_NO_ERROR; }
 
-    // deprecated (doesn't make sense!), don't use
+    // this doesn't make sense for all streams, always test its return value
     virtual size_t GetSize() const { return 0; }
 
 #if WXWIN_COMPATIBILITY_2_2
@@ -106,7 +106,7 @@ protected:
 // wxInputStream: base class for the input streams
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxInputStream : public wxStreamBase
+class WXDLLIMPEXP_BASE wxInputStream : public wxStreamBase
 {
 public:
     // ctor and dtor, nothing exciting
@@ -232,13 +232,15 @@ protected:
     size_t m_wbackcur;
 
     friend class wxStreamBuffer;
+
+    DECLARE_NO_COPY_CLASS(wxInputStream)
 };
 
 // ----------------------------------------------------------------------------
 // wxOutputStream: base for the output streams
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxOutputStream : public wxStreamBase
+class WXDLLIMPEXP_BASE wxOutputStream : public wxStreamBase
 {
 public:
     wxOutputStream();
@@ -264,6 +266,8 @@ protected:
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
 
     friend class wxStreamBuffer;
+
+    DECLARE_NO_COPY_CLASS(wxOutputStream)
 };
 
 // ============================================================================
@@ -274,7 +278,7 @@ protected:
 // A stream for measuring streamed output
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxCountingOutputStream : public wxOutputStream
+class WXDLLIMPEXP_BASE wxCountingOutputStream : public wxOutputStream
 {
 public:
     wxCountingOutputStream();
@@ -288,13 +292,15 @@ protected:
     virtual off_t OnSysTell() const;
 
     size_t m_currentPos;
+
+    DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
 };
 
 // ---------------------------------------------------------------------------
 // "Filter" streams
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxFilterInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxFilterInputStream : public wxInputStream
 {
 public:
     wxFilterInputStream();
@@ -313,7 +319,7 @@ protected:
     DECLARE_NO_COPY_CLASS(wxFilterInputStream)
 };
 
-class WXDLLEXPORT_BASE wxFilterOutputStream : public wxOutputStream
+class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream
 {
 public:
     wxFilterOutputStream();
@@ -339,7 +345,7 @@ protected:
 // wxBufferedStreams to implement custom buffering
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxStreamBuffer
+class WXDLLIMPEXP_BASE wxStreamBuffer
 {
 public:
     enum BufMode
@@ -457,7 +463,7 @@ private:
 // wxBufferedInputStream
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxBufferedInputStream : public wxFilterInputStream
+class WXDLLIMPEXP_BASE wxBufferedInputStream : public wxFilterInputStream
 {
 public:
     // if a non NULL buffer is given to the stream, it will be deleted by it
@@ -493,7 +499,7 @@ protected:
 // wxBufferedOutputStream
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxBufferedOutputStream : public wxFilterOutputStream
+class WXDLLIMPEXP_BASE wxBufferedOutputStream : public wxFilterOutputStream
 {
 public:
     // if a non NULL buffer is given to the stream, it will be deleted by it