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

compilation fixes for wxMemoryStreams

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-11-23 16:26:12 +00:00
parent c67d60484b
commit 67c8c225f4
4 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/stream.cpp
View File

@@ -132,14 +132,22 @@ wxStreamBuffer::~wxStreamBuffer()
void wxStreamBuffer::SetBufferIO(void *buffer_start,
void *buffer_end,
bool takeOwnership)
{
SetBufferIO(buffer_start, (char *)buffer_end - (char *)buffer_start,
takeOwnership);
}
void wxStreamBuffer::SetBufferIO(void *start,
size_t len,
bool takeOwnership)
{
// start by freeing the old buffer
FreeBuffer();
m_buffer_start = (char *)buffer_start;
m_buffer_end = (char *)buffer_end;
m_buffer_start = (char *)start;
m_buffer_end = m_buffer_start + len;
m_buffer_size = m_buffer_end - m_buffer_start;
m_buffer_size = len;
// if we own it, we free it
m_destroybuf = !takeOwnership;
@@ -154,8 +162,7 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize)
if ( bufsize )
{
char *buf = (char *)malloc(bufsize);
SetBufferIO(buf, buf + bufsize, TRUE /* take ownership */);
SetBufferIO(malloc(bufsize), bufsize, TRUE /* take ownership */);
}
else // no buffer size => no buffer
{