fixed bug in wxStreamBuffer::Read(wxStreamBuffer *) and improved its documentation...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index ae373127d70fe1205ab07961fca875cadd8bc494..ae978e38b31069f9afe525d696e96c82c33ba58d 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -17,6 +17,7 @@ All:
 - wxABI_VERSION, see 'Backward Compatibility' topic overview in the manual.
 - Added wxLongLong::ToDouble()
 - Added wxDateTime::[Make]FromTimezone(), fixed several TZ-related bugs
+- Fixed bug in wxStreamBuffer::Read(wxStreamBuffer *) (Paul Cornett)
 
 All (GUI):
 

diff --git a/docs/latex/wx/stream.tex b/docs/latex/wx/stream.tex
index a0bd5a64d1bf5285f22a72464290e9fff087fa43..45a146774a9e35c75b5c626f4ae4d6fb40b3d256 100644 (file)
--- a/docs/latex/wx/stream.tex
+++ b/docs/latex/wx/stream.tex
@@ -95,8 +95,8 @@ It returns the size of the data read. If the returned size is different of the s
 
 \func{size\_t}{Read}{\param{wxStreamBuffer *}{buffer}}
 
-Reads a {\it buffer}. The function returns when {\it buffer} is full or when there isn't
-data anymore in the current buffer.
+Copies data to {\it buffer}. The function returns when {\it buffer} is full or when there isn't
+any more data in the current buffer.
 
 \wxheading{See also}
 

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 271f7490ae38c0a2c6538d5505eecb131eb41f40..babad3a1100956df4c0ba5dccc18bd8d74e7ea5a 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -434,7 +434,7 @@ size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)
 
     do
     {
-        nRead = Read(dbuf, WXSIZEOF(buf));
+        nRead = Read(buf, WXSIZEOF(buf));
         if ( nRead )
         {
             nRead = dbuf->Write(buf, nRead);