implement {Create,Clone}RefData for gtk wxBitmap

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 4f1886eaeeb82ba1474b0b63d8dcf5976ae0bf33..f7786777284e9b4c4e24f0a1a116347aba08e98d 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -21,15 +21,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_STREAMS
 
 #endif
 
 #if wxUSE_STREAMS
 

-#include <stdlib.h>
-#include "wx/stream.h"

 #include "wx/mstream.h"
 
 #include "wx/mstream.h"
 

+#ifndef   WX_PRECOMP
+    #include  "wx/stream.h"
+#endif  //WX_PRECOMP
+
+#include <stdlib.h>
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -59,7 +63,7 @@ wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
     }
 
     const size_t len = wx_truncate_cast(size_t, lenFile);
     }
 
     const size_t len = wx_truncate_cast(size_t, lenFile);

-    wxASSERT_MSG( len == lenFile, _T("huge files not supported") );
+    wxASSERT_MSG( len == lenFile + size_t(0), _T("huge files not supported") );

 
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer
 
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer


@@ -88,11 +92,6 @@ char wxMemoryInputStream::Peek()
     return buf[pos];
 }
 
     return buf[pos];
 }
 

-bool wxMemoryInputStream::Eof() const
-{
-    return !m_i_streambuf->GetBytesLeft();
-}
-

 size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
 {
     size_t pos = m_i_streambuf->GetIntPosition();
 size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
 {
     size_t pos = m_i_streambuf->GetIntPosition();