Move code removing "-psn_xxx" command line arguments to common code.

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

diff --git a/interface/wx/stream.h b/interface/wx/stream.h
index 6fd27a412607116e8657c04d7c8e1de30eff55aa..5eccd60e15bb5bd05b50998e96ebafeb06182f91 100644 (file)
--- a/interface/wx/stream.h
+++ b/interface/wx/stream.h
@@ -2,7 +2,6 @@
 // Name:        stream.h
 // Purpose:     interface of wxStreamBase and its derived classes
 // Author:      wxWidgets team
 // Name:        stream.h
 // Purpose:     interface of wxStreamBase and its derived classes
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -537,6 +536,20 @@ public:
     */
     wxOutputStream& Write(wxInputStream& stream_in);
 
     */
     wxOutputStream& Write(wxInputStream& stream_in);
 

+    /**
+        Writes exactly the specified number of bytes from the buffer.
+
+        Returns @true if exactly @a size bytes were written. Otherwise, returns
+        @false and LastWrite() should be used to retrieve the exact amount of
+        the data written if necessary.
+
+        This method uses repeated calls to Write() (which may return writing
+        only part of the data) if necessary.
+
+        @since 2.9.5
+    */
+    bool WriteAll(const void* buffer, size_t size);
+

 protected:
     /**
         Internal function. It is called when the stream wants to write data of the
 protected:
     /**
         Internal function. It is called when the stream wants to write data of the


@@ -629,6 +642,23 @@ public:
     */
     wxInputStream& Read(wxOutputStream& stream_out);
 
     */
     wxInputStream& Read(wxOutputStream& stream_out);
 

+    /**
+        Reads exactly the specified number of bytes into the buffer.
+
+        Returns @true only if the entire amount of data was read, otherwise
+        @false is returned and the number of bytes really read can be retrieved
+        using LastRead(), as with Read().
+
+        This method uses repeated calls to Read() (which may return after
+        reading less than the requested number of bytes) if necessary.
+
+        @warning
+        The buffer absolutely needs to have at least the specified size.
+
+        @since 2.9.5
+    */
+    bool ReadAll(void* buffer, size_t size);
+

     /**
         Changes the stream current position.
 
     /**
         Changes the stream current position.
 


@@ -722,9 +752,11 @@ public:
     virtual ~wxCountingOutputStream();
 
     /**
     virtual ~wxCountingOutputStream();
 
     /**

-        Returns the current size of the stream.
+        Returns the current length of the stream.
+
+        This is the amount of data written to the stream so far, in bytes.

     */
     */

-    size_t GetSize() const;
+    virtual wxFileOffset GetLength() const;

 };
 
 
 };