Fix eval order of arguments...

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index b9ccfcd2c36701282c186a3aec30ba2860812178..e797ad3f67686662de7508628230724fddfc7371 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -621,7 +621,7 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
 
 wxFileOffset wxStreamBuffer::Tell() const
 {
 
 wxFileOffset wxStreamBuffer::Tell() const
 {

-    wxFileSize_t pos;
+    wxFileOffset pos;

 
     // ask the stream for position if we have a real one
     if ( m_stream )
 
     // ask the stream for position if we have a real one
     if ( m_stream )


@@ -657,6 +657,12 @@ wxStreamBase::~wxStreamBase()
 {
 }
 
 {
 }
 

+size_t wxStreamBase::GetSize() const
+{
+    wxFileOffset length = GetLength();
+    return length == wxInvalidOffset ? 0 : (size_t)length;
+}
+

 wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
 {
     return wxInvalidOffset;
 wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
 {
     return wxInvalidOffset;


@@ -667,6 +673,20 @@ wxFileOffset wxStreamBase::OnSysTell() const
     return wxInvalidOffset;
 }
 
     return wxInvalidOffset;
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+
+wxStreamError wxStreamBase::LastError() const
+{
+    return m_lasterror;
+}
+
+size_t wxStreamBase::StreamSize() const
+{
+    return GetSize();
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
+

 // ----------------------------------------------------------------------------
 // wxInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxInputStream
 // ----------------------------------------------------------------------------


@@ -889,7 +909,7 @@ wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
 
 wxFileOffset wxInputStream::TellI() const
 {
 
 wxFileOffset wxInputStream::TellI() const
 {

-    wxFileSize_t pos = OnSysTell();
+    wxFileOffset pos = OnSysTell();

 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);
 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);


@@ -957,7 +977,7 @@ wxCountingOutputStream::wxCountingOutputStream ()
      m_currentPos = 0;
 }
 
      m_currentPos = 0;
 }
 

-size_t wxCountingOutputStream::GetSize() const
+wxFileOffset wxCountingOutputStream::GetLength() const

 {
     return m_lastcount;
 }
 {
     return m_lastcount;
 }


@@ -1122,7 +1142,7 @@ wxFileOffset wxBufferedInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
 
 wxFileOffset wxBufferedInputStream::TellI() const
 {
 
 wxFileOffset wxBufferedInputStream::TellI() const
 {

-    wxFileSize_t pos = m_i_streambuf->Tell();
+    wxFileOffset pos = m_i_streambuf->Tell();

 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);
 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);


@@ -1179,6 +1199,13 @@ wxBufferedOutputStream::~wxBufferedOutputStream()
     delete m_o_streambuf;
 }
 
     delete m_o_streambuf;
 }
 

+bool wxBufferedOutputStream::Close()
+{
+    Sync();
+    return IsOk();
+}
+
+

 wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
 {
     m_lastcount = 0;
 wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
 {
     m_lastcount = 0;


@@ -1218,9 +1245,9 @@ wxFileOffset wxBufferedOutputStream::OnSysTell() const
     return m_parent_o_stream->TellO();
 }
 
     return m_parent_o_stream->TellO();
 }
 

-size_t wxBufferedOutputStream::GetSize() const
+wxFileOffset wxBufferedOutputStream::GetLength() const

 {
 {

-   return m_parent_o_stream->GetSize() + m_o_streambuf->GetIntPosition();
+   return m_parent_o_stream->GetLength() + m_o_streambuf->GetIntPosition();

 }
 
 void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
 }
 
 void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)