Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. removed 'B' flag from treebase.cpp and regenerated the makefiles

Browse Source 
2. fixed wxMemoryInputStream::Eof()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-12 15:15:44 +00:00
parent 5100cabffa
commit 83141d3a74
16 changed files with 100 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/mstream.cpp
View File

@@ -51,14 +51,25 @@ 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 bufsize = m_i_streambuf->GetBufferEnd() - m_i_streambuf->GetBufferStart();
size_t oldpos = m_i_streambuf->GetIntPosition();
m_i_streambuf->Read(buffer, nbytes);
size_t newpos = m_i_streambuf->GetIntPosition();
if (newpos == 0) return bufsize - oldpos;
else return newpos - oldpos;
{
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)