Compilo.

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index b1ac75aa948985f9e7968230bdc50e8ac2f77826..5c4302a6407118f019b247056bd26af90c2a45cd 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "mstream.h"
 #endif
 
 #pragma implementation "mstream.h"
 #endif
 


@@ -47,7 +47,7 @@ wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO((void *)data, len); // const_cast
     m_i_streambuf->SetIntPosition(0); // seek to start pos
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO((void *)data, len); // const_cast
     m_i_streambuf->SetIntPosition(0); // seek to start pos

-    m_i_streambuf->Fixed(TRUE);
+    m_i_streambuf->Fixed(true);

 
     m_length = len;
 }
 
     m_length = len;
 }


@@ -85,12 +85,12 @@ size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
     return m_i_streambuf->GetIntPosition() - pos;
 }
 
     return m_i_streambuf->GetIntPosition() - pos;
 }
 

-off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxMemoryInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
     return m_i_streambuf->Seek(pos, mode);
 }
 
 {
     return m_i_streambuf->Seek(pos, mode);
 }
 

-off_t wxMemoryInputStream::OnSysTell() const
+wxFileOffset wxMemoryInputStream::OnSysTell() const

 {
     return m_i_streambuf->Tell();
 }
 {
     return m_i_streambuf->Tell();
 }


@@ -104,8 +104,8 @@ wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len)
     m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
     if ( data )
         m_o_streambuf->SetBufferIO(data, len);
     m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
     if ( data )
         m_o_streambuf->SetBufferIO(data, len);

-    m_o_streambuf->Fixed(FALSE);
-    m_o_streambuf->Flushable(FALSE);
+    m_o_streambuf->Fixed(false);
+    m_o_streambuf->Flushable(false);

 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()
 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()


@@ -126,12 +126,12 @@ size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
     return newpos - oldpos;
 }
 
     return newpos - oldpos;
 }
 

-off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxMemoryOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
     return m_o_streambuf->Seek(pos, mode);
 }
 
 {
     return m_o_streambuf->Seek(pos, mode);
 }
 

-off_t wxMemoryOutputStream::OnSysTell() const
+wxFileOffset wxMemoryOutputStream::OnSysTell() const

 {
     return m_o_streambuf->Tell();
 }
 {
     return m_o_streambuf->Tell();
 }