standard icons for msg boxes

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index ecedf6b10608ee7398ecf4ec1bde547faa1851b1..cc38a5022b311ecb3afb240f3b2e4c87b50174b0 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -15,40 +15,89 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+  #include "wx/defs.h"
+#endif
+
+#if wxUSE_STREAMS
+

 #include <ctype.h>
 #include <wx/stream.h>
 #include <wx/datstrm.h>
 #include <wx/objstrm.h>
 
 #include <ctype.h>
 #include <wx/stream.h>
 #include <wx/datstrm.h>
 #include <wx/objstrm.h>
 

-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#define BUF_TEMP_SIZE 10000

 
 // ----------------------------------------------------------------------------
 // wxStreamBuffer
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStreamBuffer
 // ----------------------------------------------------------------------------
 

+#define CHECK_ERROR(err) \
+   if (m_stream->m_lasterror == wxStream_NOERROR) \
+     m_stream->m_lasterror = err
+

 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),

-    m_buffer_size(0), m_stream(&stream), m_mode(mode)
+    m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
+    m_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
+    m_mode(mode), m_destroybuf(FALSE), m_destroystream(FALSE)

 {
 }
 
 {
 }
 

+wxStreamBuffer::wxStreamBuffer(BufMode mode)
+  : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
+    m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
+    m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL),
+    m_mode(mode), m_destroybuf(FALSE), m_destroystream(TRUE)
+{
+  m_stream = new wxStreamBase();
+}
+
+wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
+{
+  m_buffer_start = buffer.m_buffer_start;
+  m_buffer_end = buffer.m_buffer_end;
+  m_buffer_pos = buffer.m_buffer_pos;
+  m_buffer_size = buffer.m_buffer_size;
+  m_fixed = buffer.m_fixed;
+  m_flushable = buffer.m_flushable;
+  m_stream = buffer.m_stream;
+  m_mode = buffer.m_mode;
+  m_destroybuf = FALSE;
+  m_destroystream = FALSE;
+  m_wback = NULL;
+  m_wbacksize = 0;
+  m_wbackcur = 0;
+}
+

 wxStreamBuffer::~wxStreamBuffer()
 {
 wxStreamBuffer::~wxStreamBuffer()
 {

-  wxDELETEA(m_buffer_start);
+  if (m_wback)
+    free(m_wback);
+  if (m_destroybuf)
+    wxDELETEA(m_buffer_start);
+  if (m_destroystream)
+    delete m_stream;

 }
 
 }
 

-bool wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)
+size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)

 {
   char *ptrback;
 
 {
   char *ptrback;
 

+  if (m_mode != read)
+    return 0;
+

   ptrback = AllocSpaceWBack(bufsize);
   if (!ptrback)
   ptrback = AllocSpaceWBack(bufsize);
   if (!ptrback)

-    return FALSE;
+    return 0;

 
   memcpy(ptrback, buf, bufsize);
 
   memcpy(ptrback, buf, bufsize);

-  return TRUE;
+  return bufsize;

 }
 
 bool wxStreamBuffer::WriteBack(char c)
 }
 
 bool wxStreamBuffer::WriteBack(char c)


@@ -65,10 +114,13 @@ bool wxStreamBuffer::WriteBack(char c)
 
 void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
 {
 
 void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
 {

+  if (m_destroybuf)
+    wxDELETEA(m_buffer_start);

   m_buffer_start = buffer_start;
   m_buffer_end   = buffer_end;
 
   m_buffer_size = m_buffer_end-m_buffer_start;
   m_buffer_start = buffer_start;
   m_buffer_end   = buffer_end;
 
   m_buffer_size = m_buffer_end-m_buffer_start;

+  m_destroybuf = FALSE;

   ResetBuffer();
 }
 
   ResetBuffer();
 }
 


@@ -76,7 +128,8 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize)
 {
   char *b_start;
 
 {
   char *b_start;
 

-  wxDELETE(m_buffer_start);
+  if (m_destroybuf)
+    wxDELETEA(m_buffer_start);

 
   if (!bufsize) {
     m_buffer_start = NULL;
 
   if (!bufsize) {
     m_buffer_start = NULL;


@@ -87,12 +140,14 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize)
   }
 
   b_start = new char[bufsize];
   }
 
   b_start = new char[bufsize];

-

   SetBufferIO(b_start, b_start + bufsize);
   SetBufferIO(b_start, b_start + bufsize);

+  m_destroybuf = TRUE;

 }
 
 void wxStreamBuffer::ResetBuffer()
 {
 }
 
 void wxStreamBuffer::ResetBuffer()
 {

+  m_stream->m_lasterror = wxStream_NOERROR;
+  m_stream->m_lastcount = 0;

   if (m_mode == read)
     m_buffer_pos = m_buffer_end;
   else
   if (m_mode == read)
     m_buffer_pos = m_buffer_end;
   else


@@ -112,7 +167,9 @@ char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size)
 
   if (!temp_b)
     return NULL;
 
   if (!temp_b)
     return NULL;

-  return (char *)((size_t)m_wback+(m_wbacksize-needed_size));
+  m_wback = temp_b;
+  
+  return (char *)(m_wback+(m_wbacksize-needed_size));

 }
 
 size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
 }
 
 size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)


@@ -152,7 +209,7 @@ bool wxStreamBuffer::FlushBuffer()
 {
   size_t count, current;
 
 {
   size_t count, current;
 

-  if (m_buffer_pos == m_buffer_start)
+  if (m_buffer_pos == m_buffer_start || !m_flushable)

     return FALSE;
 
   current = m_buffer_pos-m_buffer_start;
     return FALSE;
 
   current = m_buffer_pos-m_buffer_start;


@@ -182,6 +239,7 @@ void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size)
   if (s_toput < size && !m_fixed) {
     m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size+size);
     // I round a bit
   if (s_toput < size && !m_fixed) {
     m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size+size);
     // I round a bit

+    m_buffer_size += size;

     m_buffer_end = m_buffer_start+m_buffer_size;
     s_toput = size;
   }
     m_buffer_end = m_buffer_start+m_buffer_size;
     s_toput = size;
   }


@@ -191,25 +249,66 @@ void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size)
   m_buffer_pos += s_toput;
 }
 
   m_buffer_pos += s_toput;
 }
 

-void wxStreamBuffer::Read(void *buffer, size_t size)
+void wxStreamBuffer::PutChar(char c)
+{
+  wxASSERT(m_stream != NULL);
+
+  if (!m_buffer_size) {
+    m_stream->OnSysWrite(&c, 1);
+    return;
+  }
+
+  if (GetDataLeft() == 0 && !FlushBuffer()) {
+    CHECK_ERROR(wxStream_WRITE_ERR);
+    return;
+  }
+
+  PutToBuffer(&c, 1);
+  m_stream->m_lastcount = 1;
+}
+
+char wxStreamBuffer::GetChar()
+{
+  char c;
+
+  wxASSERT(m_stream != NULL);
+
+  if (!m_buffer_size) {
+    m_stream->OnSysRead(&c, 1);
+    return c;
+  }
+
+  if (!GetDataLeft()) {
+    CHECK_ERROR(wxStream_READ_ERR);
+    return 0;
+  }
+
+  GetFromBuffer(&c, 1);
+  m_stream->m_lastcount = 1;
+  return c;
+}
+
+size_t wxStreamBuffer::Read(void *buffer, size_t size)

 {
   wxASSERT(m_stream != NULL);
 
 {
   wxASSERT(m_stream != NULL);
 

+  if (m_mode == write)
+    return 0;
+

   // ------------------
   // Buffering disabled
   // ------------------
 
   // ------------------
   // Buffering disabled
   // ------------------
 

+  m_stream->m_lasterror = wxStream_NOERROR;

   m_stream->m_lastcount = GetWBack((char *)buffer, size);
   size -= m_stream->m_lastcount;
   if (size == 0)
   m_stream->m_lastcount = GetWBack((char *)buffer, size);
   size -= m_stream->m_lastcount;
   if (size == 0)

-    return;
+    return m_stream->m_lastcount;

 
   buffer = (void *)((char *)buffer+m_stream->m_lastcount);
 
 
   buffer = (void *)((char *)buffer+m_stream->m_lastcount);
 

-  if (!m_buffer_size) {
-    m_stream->m_lastcount += m_stream->OnSysRead(buffer, size);
-    return;
-  }
+  if (!m_buffer_size)
+    return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));

 
   // -----------------
   // Buffering enabled
 
   // -----------------
   // Buffering enabled


@@ -220,15 +319,15 @@ void wxStreamBuffer::Read(void *buffer, size_t size)
     buf_left = GetDataLeft(); 
 
     // First case: the requested buffer is larger than the stream buffer,
     buf_left = GetDataLeft(); 
 
     // First case: the requested buffer is larger than the stream buffer,

-    //             we split
+    //             we split it.

     if (size > buf_left) {
       GetFromBuffer(buffer, buf_left);
       size  -= buf_left;
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FillBuffer()) {
     if (size > buf_left) {
       GetFromBuffer(buffer, buf_left);
       size  -= buf_left;
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FillBuffer()) {

-        m_stream->m_lastcount = orig_size-size;
-        return;
+        CHECK_ERROR(wxStream_READ_ERR);
+        return (m_stream->m_lastcount = orig_size-size);

       }
     } else {
 
       }
     } else {
 


@@ -237,21 +336,39 @@ void wxStreamBuffer::Read(void *buffer, size_t size)
       break;
     }
   }
       break;
     }
   }

-  m_stream->m_lastcount += orig_size;
+  return (m_stream->m_lastcount += orig_size);
+}
+
+size_t wxStreamBuffer::Read(wxStreamBuffer *s_buf)
+{
+  char buf[BUF_TEMP_SIZE];
+  size_t s = 0, bytes_read = BUF_TEMP_SIZE;
+
+  if (m_mode == write)
+    return 0;
+
+  while (bytes_read != 0) {
+    bytes_read = Read(buf, bytes_read);
+    bytes_read = s_buf->Write(buf, bytes_read);
+    s += bytes_read;
+  }
+  return s;

 }
 
 }
 

-void wxStreamBuffer::Write(const void *buffer, size_t size)
+size_t wxStreamBuffer::Write(const void *buffer, size_t size)

 {
   wxASSERT(m_stream != NULL);
 
 {
   wxASSERT(m_stream != NULL);
 

+  if (m_mode == read)
+    return 0;
+

   // ------------------
   // Buffering disabled
   // ------------------
 
   // ------------------
   // Buffering disabled
   // ------------------
 

-  if (!m_buffer_size) {
-    m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size);
-    return;
-  }
+  m_stream->m_lasterror = wxStream_NOERROR;
+  if (!m_buffer_size)
+    return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));

 
   // ------------------
   // Buffering enabled
 
   // ------------------
   // Buffering enabled


@@ -270,9 +387,10 @@ void wxStreamBuffer::Write(const void *buffer, size_t size)
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FlushBuffer()) {
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FlushBuffer()) {

-        m_stream->m_lastcount = orig_size-size;
-        return;
+       CHECK_ERROR(wxStream_WRITE_ERR);
+        return (m_stream->m_lastcount = orig_size-size);

       }
       }

+

       m_buffer_pos = m_buffer_start;
 
     } else {
       m_buffer_pos = m_buffer_start;
 
     } else {


@@ -282,7 +400,25 @@ void wxStreamBuffer::Write(const void *buffer, size_t size)
       break;
     }
   }
       break;
     }
   }

-  m_stream->m_lastcount = orig_size;
+  return (m_stream->m_lastcount = orig_size);
+}
+
+size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
+{
+  char buf[BUF_TEMP_SIZE];
+  size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2;
+
+  if (m_mode == read)
+    return 0;
+
+  while (bytes_count == BUF_TEMP_SIZE) {
+    b_count2 = sbuf->Read(buf, bytes_count);
+    bytes_count = Write(buf, b_count2);
+    if (b_count2 > bytes_count)
+      sbuf->WriteBack(buf+bytes_count, b_count2-bytes_count);
+    s += bytes_count;
+  }
+  return s;

 }
 
 off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode)
 }
 
 off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode)


@@ -291,6 +427,14 @@ off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode)
 
   last_access = GetLastAccess();
 
 
   last_access = GetLastAccess();
 

+  if (!m_flushable) {
+    diff = pos + GetIntPosition();
+    if (diff < 0 || diff > last_access)
+      return wxInvalidOffset;
+    SetIntPosition(diff);
+    return diff;
+  }
+

   switch (mode) {
   case wxFromStart: {
     // We'll try to compute an internal position later ...
   switch (mode) {
   case wxFromStart: {
     // We'll try to compute an internal position later ...


@@ -323,15 +467,19 @@ off_t wxStreamBuffer::Tell() const
 {
   off_t pos;
 
 {
   off_t pos;
 

-  pos = m_stream->OnSysTell();
-  if (pos == wxInvalidOffset)
-    return wxInvalidOffset;
-
-  return pos - GetLastAccess() + GetIntPosition();
+  if (m_flushable) {
+    pos = m_stream->OnSysTell();
+    if (pos == wxInvalidOffset)
+      return wxInvalidOffset;
+    return pos - GetLastAccess() + GetIntPosition();
+  } else
+    return GetIntPosition();

 }
 
 }
 

-size_t wxStreamBuffer::GetDataLeft() const
+size_t wxStreamBuffer::GetDataLeft()

 {
 {

+  if (m_buffer_end == m_buffer_pos && m_flushable)
+    FillBuffer();

   return m_buffer_end-m_buffer_pos;
 }
 
   return m_buffer_end-m_buffer_pos;
 }
 


@@ -349,22 +497,22 @@ wxStreamBase::~wxStreamBase()
 {
 }
 
 {
 }
 

-size_t wxStreamBase::OnSysRead(void *buffer, size_t size)
+size_t wxStreamBase::OnSysRead(void *WXUNUSED(buffer), size_t WXUNUSED(size))

 {
   return 0;
 }
 
 {
   return 0;
 }
 

-size_t wxStreamBase::OnSysWrite(const void *buffer, size_t bufsize)
+size_t wxStreamBase::OnSysWrite(const void *WXUNUSED(buffer), size_t WXUNUSED(bufsize))

 {
   return 0;
 }
 
 {
   return 0;
 }
 

-off_t wxStreamBase::OnSysSeek(off_t seek, wxSeekMode mode)
+off_t wxStreamBase::OnSysSeek(off_t WXUNUSED(seek), wxSeekMode WXUNUSED(mode))

 {
   return wxInvalidOffset;
 }
 
 {
   return wxInvalidOffset;
 }
 

-off_t wxStreamBase::OnSysTell()
+off_t wxStreamBase::OnSysTell() const

 {
   return wxInvalidOffset;
 }
 {
   return wxInvalidOffset;
 }


@@ -409,23 +557,20 @@ wxInputStream& wxInputStream::Read(void *buffer, size_t size)
 
 char wxInputStream::Peek()
 {
 
 char wxInputStream::Peek()
 {

-  if (!m_i_streambuf->GetDataLeft())
-    m_i_streambuf->FillBuffer();
+  m_i_streambuf->GetDataLeft();

 
   return *(m_i_streambuf->GetBufferPos());
 }
 
 
   return *(m_i_streambuf->GetBufferPos());
 }
 

-#define BUF_TEMP_SIZE 10000

 
 wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 {
   char buf[BUF_TEMP_SIZE]; 
   size_t bytes_read = BUF_TEMP_SIZE;
 
 
 wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 {
   char buf[BUF_TEMP_SIZE]; 
   size_t bytes_read = BUF_TEMP_SIZE;
 

-  while (bytes_read == BUF_TEMP_SIZE && stream_out.LastError() != wxStream_NOERROR) {
+  while (bytes_read == BUF_TEMP_SIZE) {

     bytes_read = Read(buf, bytes_read).LastRead();
     bytes_read = Read(buf, bytes_read).LastRead();

-
-    stream_out.Write(buf, bytes_read);
+    bytes_read = stream_out.Write(buf, bytes_read).LastWrite();

   }
   return *this;
 }
   }
   return *this;
 }


@@ -614,7 +759,12 @@ wxOutputStream& wxOutputStream::operator<<(const char *string)
 
 wxOutputStream& wxOutputStream::operator<<(wxString& string)
 {
 
 wxOutputStream& wxOutputStream::operator<<(wxString& string)
 {

+#if wxUSE_UNICODE
+  const wxWX2MBbuf buf = string.mb_str();
+  return *this << buf;
+#else

   return Write(string, string.Len());
   return Write(string, string.Len());

+#endif

 }
 
 wxOutputStream& wxOutputStream::operator<<(char c)
 }
 
 wxOutputStream& wxOutputStream::operator<<(char c)


@@ -626,32 +776,32 @@ wxOutputStream& wxOutputStream::operator<<(short i)
 {
   wxString strint;
 
 {
   wxString strint;
 

-  strint.Printf("%i", i);
-  return Write(strint, strint.Len());
+  strint.Printf(_T("%i"), i);
+  return *this << strint;

 }
 
 wxOutputStream& wxOutputStream::operator<<(int i)
 {
   wxString strint;
 
 }
 
 wxOutputStream& wxOutputStream::operator<<(int i)
 {
   wxString strint;
 

-  strint.Printf("%i", i);
-  return Write(strint, strint.Len());
+  strint.Printf(_T("%i"), i);
+  return *this << strint;

 }
 
 wxOutputStream& wxOutputStream::operator<<(long i)
 {
   wxString strlong;
 
 }
 
 wxOutputStream& wxOutputStream::operator<<(long i)
 {
   wxString strlong;
 

-  strlong.Printf("%i", i);
-  return Write((const char *)strlong, strlong.Len());
+  strlong.Printf(_T("%i"), i);
+  return *this << strlong;

 }
 
 wxOutputStream& wxOutputStream::operator<<(double f)
 {
   wxString strfloat;
 
 }
 
 wxOutputStream& wxOutputStream::operator<<(double f)
 {
   wxString strfloat;
 

-  strfloat.Printf("%f", f);
-  return Write(strfloat, strfloat.Len());
+  strfloat.Printf(_T("%f"), f);
+  return *this << strfloat;

 }
 
 #if wxUSE_SERIAL
 }
 
 #if wxUSE_SERIAL


@@ -712,3 +862,6 @@ wxOutputStream& wxEndL(wxOutputStream& stream)
   return stream.Write("\n", 1);
 #endif
 }
   return stream.Write("\n", 1);
 #endif
 }

+
+#endif
+  // wxUSE_STREAMS