fixed incorrect GetTextExtent for wxTELETYPE font

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index c9f23704668d4a52def03835fa52ec7abc53921a..b0f1ab6a1a443dbe88df1b387bc6393a51a807ad 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -20,15 +20,11 @@
   #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-
 #if wxUSE_STREAMS
 
 #include <stdlib.h>
-#include <wx/stream.h>
-#include <wx/mstream.h>
+#include "wx/stream.h"
+#include "wx/mstream.h"
 
 // ----------------------------------------------------------------------------
 // wxMemoryInputStream
@@ -37,14 +33,17 @@
 wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len)
   : wxInputStream()
 {
+  m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
   m_i_streambuf->SetBufferIO((char*) data, (char*) (data+len));
   m_i_streambuf->SetIntPosition(0); // seek to start pos
   m_i_streambuf->Fixed(TRUE);
+
   m_length = len;
 }
 
 wxMemoryInputStream::~wxMemoryInputStream()
 {
+  delete m_i_streambuf;
 }
 
 char wxMemoryInputStream::Peek()
@@ -52,6 +51,37 @@ char wxMemoryInputStream::Peek()
   return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()];
 }
 
+bool wxMemoryInputStream::Eof() const
+{
+    return m_i_streambuf->GetBufferPos() == m_i_streambuf->GetBufferEnd();
+}
+
+size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
+{
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_EOF;
+
+        return 0;
+    }
+
+    m_i_streambuf->Read(buffer, nbytes);
+    m_lasterror = wxSTREAM_NOERROR;
+
+    return m_i_streambuf->GetIntPosition() - pos;
+}
+
+off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+  return m_i_streambuf->Seek(pos, mode);
+}
+
+off_t wxMemoryInputStream::OnSysTell() const
+{
+  return m_i_streambuf->Tell();
+}
+
 // ----------------------------------------------------------------------------
 // wxMemoryOutputStream
 // ----------------------------------------------------------------------------
@@ -59,13 +89,48 @@ char wxMemoryInputStream::Peek()
 wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
   : wxOutputStream()
 {
+  m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
   if (data)
     m_o_streambuf->SetBufferIO(data, data+len);
-  m_o_streambuf->Fixed(TRUE);
+  m_o_streambuf->Fixed(FALSE);
+  m_o_streambuf->Flushable(FALSE);
 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()
 {
+  delete m_o_streambuf;
+}
+
+size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
+{
+  size_t bufsize = m_o_streambuf->GetBufferEnd() - m_o_streambuf->GetBufferStart();
+  size_t oldpos = m_o_streambuf->GetIntPosition();
+  m_o_streambuf->Write(buffer, nbytes);
+  size_t newpos = m_o_streambuf->GetIntPosition();
+  if (newpos == 0) return bufsize - oldpos;
+  else return newpos - oldpos;
+}
+
+off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+  return m_o_streambuf->Seek(pos, mode);
+}
+
+off_t wxMemoryOutputStream::OnSysTell() const
+{
+  return m_o_streambuf->Tell();
+}
+
+size_t wxMemoryOutputStream::CopyTo(char *buffer, size_t len) const
+{
+  if (!buffer)
+    return 0;
+
+  if (len > GetSize())
+    len = GetSize();
+
+  memcpy(buffer, m_o_streambuf->GetBufferStart(), len);
+  return len;
 }
 
 #endif