mac cleanup, pure cgcolor

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 8aa12b5e24609c88a5dbbfadc2a5fa6e9a80fb8f..32e6fe8d15591e43d464b1491c25d57d3727e600 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -192,6 +192,28 @@ void wxStreamBuffer::ResetBuffer()
                         : m_buffer_start;
 }
 
                         : m_buffer_start;
 }
 

+void wxStreamBuffer::Truncate()
+{
+    size_t new_size = m_buffer_pos - m_buffer_start;
+    if ( new_size == m_buffer_size )
+        return;
+
+    if ( !new_size )
+    {
+        FreeBuffer();
+        InitBuffer();
+        return;
+    }
+
+    char *new_start = (char *)realloc(m_buffer_start, new_size);
+    wxCHECK_RET( new_size, _T("shrinking buffer shouldn't fail") );
+
+    m_buffer_start = new_start;
+    m_buffer_size = new_size;
+    m_buffer_end = m_buffer_start + m_buffer_size;
+    m_buffer_pos = m_buffer_end;
+}
+

 // fill the buffer with as much data as possible (only for read buffers)
 bool wxStreamBuffer::FillBuffer()
 {
 // fill the buffer with as much data as possible (only for read buffers)
 bool wxStreamBuffer::FillBuffer()
 {


@@ -657,6 +679,8 @@ wxFileOffset wxStreamBuffer::Tell() const
 // wxStreamBase
 // ----------------------------------------------------------------------------
 
 // wxStreamBase
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxStreamBase, wxObject)
+

 wxStreamBase::wxStreamBase()
 {
     m_lasterror = wxSTREAM_NO_ERROR;
 wxStreamBase::wxStreamBase()
 {
     m_lasterror = wxSTREAM_NO_ERROR;


@@ -693,6 +717,8 @@ wxFileOffset wxStreamBase::OnSysTell() const
 // wxInputStream
 // ----------------------------------------------------------------------------
 
 // wxInputStream
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxInputStream, wxStreamBase)
+

 wxInputStream::wxInputStream()
 {
     m_wback = NULL;
 wxInputStream::wxInputStream()
 {
     m_wback = NULL;


@@ -809,11 +835,11 @@ bool wxInputStream::Ungetch(char c)
     return Ungetch(&c, sizeof(c)) != 0;
 }
 
     return Ungetch(&c, sizeof(c)) != 0;
 }
 

-char wxInputStream::GetC()
+int wxInputStream::GetC()

 {
 {

-    char c;
+    unsigned char c;

     Read(&c, sizeof(c));
     Read(&c, sizeof(c));

-    return c;
+    return LastRead() ? c : wxEOF;

 }
 
 wxInputStream& wxInputStream::Read(void *buf, size_t size)
 }
 
 wxInputStream& wxInputStream::Read(void *buf, size_t size)


@@ -869,6 +895,7 @@ char wxInputStream::Peek()
 
 wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 {
 
 wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 {

+    size_t lastcount = 0;

     char buf[BUF_TEMP_SIZE];
 
     for ( ;; )
     char buf[BUF_TEMP_SIZE];
 
     for ( ;; )


@@ -879,8 +906,12 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 
         if ( stream_out.Write(buf, bytes_read).LastWrite() != bytes_read )
             break;
 
         if ( stream_out.Write(buf, bytes_read).LastWrite() != bytes_read )
             break;

+
+        lastcount += bytes_read;

     }
 
     }
 

+    m_lastcount = lastcount;
+

     return *this;
 }
 
     return *this;
 }
 


@@ -933,6 +964,8 @@ wxFileOffset wxInputStream::TellI() const
 // wxOutputStream
 // ----------------------------------------------------------------------------
 
 // wxOutputStream
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxOutputStream, wxStreamBase)
+

 wxOutputStream::wxOutputStream()
 {
 }
 wxOutputStream::wxOutputStream()
 {
 }


@@ -983,6 +1016,8 @@ void wxOutputStream::Sync()
 // wxCountingOutputStream
 // ----------------------------------------------------------------------------
 
 // wxCountingOutputStream
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_DYNAMIC_CLASS(wxCountingOutputStream, wxOutputStream)
+

 wxCountingOutputStream::wxCountingOutputStream ()
 {
      m_currentPos = 0;
 wxCountingOutputStream::wxCountingOutputStream ()
 {
      m_currentPos = 0;


@@ -1045,6 +1080,8 @@ wxFileOffset wxCountingOutputStream::OnSysTell() const
 // wxFilterInputStream
 // ----------------------------------------------------------------------------
 
 // wxFilterInputStream
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxFilterInputStream, wxInputStream)
+

 wxFilterInputStream::wxFilterInputStream()
  :  m_parent_i_stream(NULL),
     m_owns(false)
 wxFilterInputStream::wxFilterInputStream()
  :  m_parent_i_stream(NULL),
     m_owns(false)


@@ -1073,6 +1110,8 @@ wxFilterInputStream::~wxFilterInputStream()
 // wxFilterOutputStream
 // ----------------------------------------------------------------------------
 
 // wxFilterOutputStream
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxFilterOutputStream, wxOutputStream)
+

 wxFilterOutputStream::wxFilterOutputStream()
  :  m_parent_o_stream(NULL),
     m_owns(false)
 wxFilterOutputStream::wxFilterOutputStream()
  :  m_parent_o_stream(NULL),
     m_owns(false)


@@ -1106,48 +1145,49 @@ wxFilterOutputStream::~wxFilterOutputStream()
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxFilterClassFactory
+// wxFilterClassFactoryBase

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactory, wxObject)
-
-wxFilterClassFactory *wxFilterClassFactory::sm_first = NULL;
+IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactoryBase, wxObject)

 
 

-wxString wxFilterClassFactory::PopExtension(const wxString& location) const
+wxString wxFilterClassFactoryBase::PopExtension(const wxString& location) const

 {
     return location.substr(0, FindExtension(location));
 }
 
 {
     return location.substr(0, FindExtension(location));
 }
 

-wxString::size_type wxFilterClassFactory::FindExtension(const wxChar *location) const
+wxString::size_type wxFilterClassFactoryBase::FindExtension(
+        const wxString& location) const

 {
 {

-    size_t len = wxStrlen(location);
-
-    for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXTENSION);
-         p && *p;
-         p++)
+    for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXT); *p; p++)

     {
     {

-        size_t l = wxStrlen(*p);
-
-        if (l <= len && wxStrcmp(*p, location + len - l) == 0)
-            return len - l;
+        if ( location.EndsWith(*p) )
+            return location.length() - wxStrlen(*p);

     }
 
     return wxString::npos;
 }
 
     }
 
     return wxString::npos;
 }
 

-bool wxFilterClassFactory::CanHandle(const wxChar *protocol,
-                                     wxStreamProtocolType type) const
+bool wxFilterClassFactoryBase::CanHandle(const wxString& protocol,
+                                         wxStreamProtocolType type) const

 {
 {

-    if (type == wxSTREAM_FILEEXTENSION)
+    if (type == wxSTREAM_FILEEXT)

         return FindExtension(protocol) != wxString::npos;
     else
         return FindExtension(protocol) != wxString::npos;
     else

-        for (const wxChar *const *p = GetProtocols(type); p && *p; p++)
-            if (wxStrcmp(*p, protocol) == 0)
+        for (const wxChar *const *p = GetProtocols(type); *p; p++)
+            if (protocol == *p)

                 return true;
 
     return false;
 }
 
                 return true;
 
     return false;
 }
 

+// ----------------------------------------------------------------------------
+// wxFilterClassFactory
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactory, wxFilterClassFactoryBase)
+
+wxFilterClassFactory *wxFilterClassFactory::sm_first = NULL;
+

 void wxFilterClassFactory::Remove()
 {
     if (m_next != this)
 void wxFilterClassFactory::Remove()
 {
     if (m_next != this)