more timezone stuff - it's a miracle, but it seems to work

[wxWidgets.git] / src / common / stream.cpp

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 5c508e98a23893b4e9a94842a9e37f93a69865d8..ebe0c5aa1112437b01715f92ce0e7577082d1384 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -585,11 +585,10 @@ wxInputStream& wxInputStream::Read(void *buffer, size_t size)
     m_lasterror = wxStream_NOERROR;
     return *this;
   }
-  size     -= retsize;
-  buf      += retsize;
+  size -= retsize;
+  buf  += retsize;
 
-  // GRG: shouldn't we also add retsize to m_lastcount here?
-  m_lastcount = OnSysRead(buf, size);
+  m_lastcount = OnSysRead(buf, size) + retsize;
   return *this;
 }