Cleanup of wxSocket::_Wait():

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

diff --git a/interface/wx/stream.h b/interface/wx/stream.h
index f263607e4e6b68ed8185c84c2b7488db3aa96c88..2d2b1466de092fd0f9ea16b1a2d22d049f15ec03 100644 (file)
--- a/interface/wx/stream.h
+++ b/interface/wx/stream.h
@@ -115,6 +115,7 @@ public:
     /**
         Constructor; creates a new empty stream buffer which won't flush any data
         to a stream. mode specifies the type of the buffer (read, write, read_write).
     /**
         Constructor; creates a new empty stream buffer which won't flush any data
         to a stream. mode specifies the type of the buffer (read, write, read_write).

+

         This stream buffer has the advantage to be stream independent and to work
         only on memory buffers but it is still compatible with the rest of the
         wxStream classes. You can write, read to this special stream and it will
         This stream buffer has the advantage to be stream independent and to work
         only on memory buffers but it is still compatible with the rest of the
         wxStream classes. You can write, read to this special stream and it will


@@ -129,7 +130,9 @@ public:
     wxStreamBuffer(BufMode mode);
 
     /**
     wxStreamBuffer(BufMode mode);
 
     /**

-        Constructor. It initializes the stream buffer with the data of the specified
+        Constructor.
+
+        This method initializes the stream buffer with the data of the specified

         stream buffer. The new stream buffer has the same attributes, size, position
         and they share the same buffer. This will cause problems if the stream to
         which the stream buffer belong is destroyed and the newly cloned stream
         stream buffer. The new stream buffer has the same attributes, size, position
         and they share the same buffer. This will cause problems if the stream to
         which the stream buffer belong is destroyed and the newly cloned stream


@@ -450,7 +453,7 @@ enum wxStreamProtocolType
     handle it and create a stream to decompress it:
 
     @code
     handle it and create a stream to decompress it:
 
     @code

-    factory = wxFilterClassFactory::Find(filename, wxSTREAM_FILEEXT);
+        factory = wxFilterClassFactory::Find(filename, wxSTREAM_FILEEXT);

         if (factory)
             stream = factory-NewStream(new wxFFileInputStream(filename));
     @endcode
         if (factory)
             stream = factory-NewStream(new wxFFileInputStream(filename));
     @endcode


@@ -881,20 +884,23 @@ public:
     size_t OnSysRead(void* buffer, size_t bufsize);
 
     /**
     size_t OnSysRead(void* buffer, size_t bufsize);
 
     /**

-        Internal function.
-        It is called when the stream needs to change the current position.
+        See OnSysRead().

     */
     */

-    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    size_t OnSysWrite(const void* buffer, size_t bufsize);
+
+
+protected:

 
     /**
         Internal function.
 
     /**
         Internal function.

-        It is called when the stream needs to know the real position.
+        It is called when the stream needs to change the current position.

     */
     */

-    wxFileOffset OnSysTell() const;
+    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);

 
     /**
 
     /**

-        See OnSysRead().
+        Internal function.
+        It is called when the stream needs to know the real position.

     */
     */

-    size_t OnSysWrite(const void* buffer, size_t bufsize);
+    virtual wxFileOffset OnSysTell() const;

 };
 
 };