char* -> wxString

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 4f24cfc97aeab89cf40b0362a65e701d6e20f1a8..728d50b5cf5a5f8a7acaae1c3957c6fd240905a0 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -136,6 +136,7 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize)
 
 void wxStreamBuffer::ResetBuffer()
 {
+  m_stream->m_lasterror = wxStream_NOERROR;
   if (m_mode == read)
     m_buffer_pos = m_buffer_end;
   else
@@ -156,7 +157,7 @@ char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size)
   if (!temp_b)
     return NULL;
   m_wback = temp_b;
-  printf("Buffer(0x%x)->Write: 0x%x, %d\n", this, m_wback, m_wbacksize); 
+  
   return (char *)(m_wback+(m_wbacksize-needed_size));
 }
 
@@ -164,7 +165,6 @@ size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
 {
   size_t s_toget = m_wbacksize-m_wbackcur;
 
-  printf("Buffer(0x%x): 0x%x, %d\n", this, m_wback, m_wbacksize);
   if (bsize < s_toget)
     s_toget = bsize;
 
@@ -285,6 +285,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
   // Buffering disabled
   // ------------------
 
+  m_stream->m_lasterror = wxStream_NOERROR;
   m_stream->m_lastcount = GetWBack((char *)buffer, size);
   size -= m_stream->m_lastcount;
   if (size == 0)
@@ -345,6 +346,7 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
   // Buffering disabled
   // ------------------
 
+  m_stream->m_lasterror = wxStream_NOERROR;
   if (!m_buffer_size)
     return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));