Fix crash when editing wxDVC items in place in wxOSX/Cocoa.

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 3f34c95212d769ef59f8c085a919fba75129b518..9119658421f46abac4b57c6de3087b989ef94eaf 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -83,7 +83,7 @@ protected:
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxStreamBase)
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxStreamBase)

-    DECLARE_NO_COPY_CLASS(wxStreamBase)
+    wxDECLARE_NO_COPY_CLASS(wxStreamBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -218,7 +218,7 @@ protected:
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxInputStream)
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxInputStream)

-    DECLARE_NO_COPY_CLASS(wxInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxInputStream);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -254,7 +254,7 @@ protected:
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxOutputStream)
     friend class wxStreamBuffer;
 
     DECLARE_ABSTRACT_CLASS(wxOutputStream)

-    DECLARE_NO_COPY_CLASS(wxOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxOutputStream);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -282,7 +282,7 @@ protected:
     size_t m_currentPos;
 
     DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
     size_t m_currentPos;
 
     DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)

-    DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -308,7 +308,7 @@ protected:
     bool m_owns;
 
     DECLARE_ABSTRACT_CLASS(wxFilterInputStream)
     bool m_owns;
 
     DECLARE_ABSTRACT_CLASS(wxFilterInputStream)

-    DECLARE_NO_COPY_CLASS(wxFilterInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFilterInputStream);

 };
 
 class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream
 };
 
 class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream


@@ -330,7 +330,7 @@ protected:
     bool m_owns;
 
     DECLARE_ABSTRACT_CLASS(wxFilterOutputStream)
     bool m_owns;
 
     DECLARE_ABSTRACT_CLASS(wxFilterOutputStream)

-    DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxFilterOutputStream);

 };
 
 enum wxStreamProtocolType
 };
 
 enum wxStreamProtocolType


@@ -421,13 +421,13 @@ public:
         InitWithStream(stream, mode);
     }
 
         InitWithStream(stream, mode);
     }
 

-    wxStreamBuffer(wxInputStream& stream, size_t bufsize)
+    wxStreamBuffer(size_t bufsize, wxInputStream& stream)

     {
         InitWithStream(stream, read);
         SetBufferIO(bufsize);
     }
 
     {
         InitWithStream(stream, read);
         SetBufferIO(bufsize);
     }
 

-    wxStreamBuffer(wxOutputStream& stream, size_t bufsize)
+    wxStreamBuffer(size_t bufsize, wxOutputStream& stream)

     {
         InitWithStream(stream, write);
         SetBufferIO(bufsize);
     {
         InitWithStream(stream, write);
         SetBufferIO(bufsize);


@@ -530,7 +530,7 @@ protected:
          m_flushable;
 
 
          m_flushable;
 
 

-    DECLARE_NO_ASSIGN_CLASS(wxStreamBuffer)
+    wxDECLARE_NO_ASSIGN_CLASS(wxStreamBuffer);

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -579,7 +579,7 @@ protected:
 
     wxStreamBuffer *m_i_streambuf;
 
 
     wxStreamBuffer *m_i_streambuf;
 

-    DECLARE_NO_COPY_CLASS(wxBufferedInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedInputStream);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -631,7 +631,7 @@ protected:
 
     wxStreamBuffer *m_o_streambuf;
 
 
     wxStreamBuffer *m_o_streambuf;
 

-    DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxBufferedOutputStream);

 };
 
 #if WXWIN_COMPATIBILITY_2_6
 };
 
 #if WXWIN_COMPATIBILITY_2_6