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

modify signature of new wxStreamBuffer ctors to avoid conflicts with the existing ones (closes #10144)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-03-23 10:59:40 +00:00
parent 78f2eafcb6
commit 36f062d3da
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/stream.h
View File

@ -421,13 +421,13 @@ public:
InitWithStream(stream, mode);
}
wxStreamBuffer(wxInputStream& stream, size_t bufsize)
wxStreamBuffer(size_t bufsize, wxInputStream& stream)
{
InitWithStream(stream, read);
SetBufferIO(bufsize);
}
wxStreamBuffer(wxOutputStream& stream, size_t bufsize)
wxStreamBuffer(size_t bufsize, wxOutputStream& stream)
{
InitWithStream(stream, write);
SetBufferIO(bufsize);

14
interface/wx/stream.h
View File

@ -172,8 +172,13 @@ public:
and calling SetBufferIO() but is more convenient.
@since 2.9.0
@param bufsize
The size of buffer in bytes.
@param stream
The associated input stream, the buffer will be used in read mode.
*/
wxStreamBuffer(wxInputStream& stream, size_t bufsize);
wxStreamBuffer(size_t bufsize, wxInputStream& stream);
/**
Constructor for an output buffer of the specified size.
@ -182,8 +187,13 @@ public:
and calling SetBufferIO() but is more convenient.
@since 2.9.0
@param bufsize
The size of buffer in bytes.
@param stream
The associated output stream, the buffer will be used in write mode.
*/
wxStreamBuffer(wxOutputStream& stream, size_t bufsize);
wxStreamBuffer(size_t bufsize, wxOutputStream& stream);
/**
Constructor; creates a new empty stream buffer which won't flush any data

2
src/common/stream.cpp
View File

@ -1214,7 +1214,7 @@ template <typename T>
wxStreamBuffer *
CreateBufferIfNeeded(T& stream, wxStreamBuffer *buffer, size_t bufsize = 1024)
{
return buffer ? buffer : new wxStreamBuffer(stream, bufsize);
return buffer ? buffer : new wxStreamBuffer(bufsize, stream);
}
} // anonymous namespace