diff --git a/docs/changes.txt b/docs/changes.txt index ae373127d7..ae978e38b3 100644 --- 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 a0bd5a64d1..45a146774a 100644 --- 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 271f7490ae..babad3a110 100644 --- 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);