Added support for wxEXEC_MAKE_GROUP_LEADER to wxExecute().

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index e5eb69156673ab2fe2b5d3e682d001ae5d780797..8e12d632744ffcf5ea18513dd82a2e779848ea5f 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -18,7 +18,7 @@
 
 #include "wx/stream.h"
 
 
 #include "wx/stream.h"
 

-class WXDLLIMPEXP_BASE wxMemoryOutputStream;
+class WXDLLIMPEXP_FWD_BASE wxMemoryOutputStream;

 
 class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {
 
 class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 {


@@ -31,6 +31,7 @@ public:
         InitFromStream(stream, lenFile);
     }
     wxMemoryInputStream(wxMemoryInputStream& stream)
         InitFromStream(stream, lenFile);
     }
     wxMemoryInputStream(wxMemoryInputStream& stream)

+        : wxInputStream()

     {
         InitFromStream(stream, wxInvalidOffset);
     }
     {
         InitFromStream(stream, wxInvalidOffset);
     }


@@ -39,7 +40,8 @@ public:
     virtual wxFileOffset GetLength() const { return m_length; }
     virtual bool IsSeekable() const { return true; }
 
     virtual wxFileOffset GetLength() const { return m_length; }
     virtual bool IsSeekable() const { return true; }
 

-    char Peek();
+    virtual char Peek();
+    virtual bool CanRead() const;

 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 


@@ -62,7 +64,8 @@ private:
     size_t m_length;
 
     // copy ctor is implemented above: it copies the other stream in this one
     size_t m_length;
 
     // copy ctor is implemented above: it copies the other stream in this one

-    DECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream)
+    DECLARE_ABSTRACT_CLASS(wxMemoryInputStream)
+    wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream);

 };
 
 class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream
 };
 
 class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream


@@ -91,7 +94,8 @@ protected:
     wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
     wxFileOffset OnSysTell() const;
 
     wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
     wxFileOffset OnSysTell() const;
 

-    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
+    DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream);

 };
 
 #if WXWIN_COMPATIBILITY_2_6
 };
 
 #if WXWIN_COMPATIBILITY_2_6