* wxSocket fixes
* wxStream: - new inheritance, new stream buffer, nearly the same API for the end user - updated other streams consequently * wxGTK: some change to make it compile on GTK 1.0 and GTK 1.1 * small changes on wxThread to prepare a more reentrant lib * wxVariant works with wxStream too now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,53 +13,18 @@
|
||||
|
||||
#include <wx/stream.h>
|
||||
|
||||
class wxMemoryStreamBase {
|
||||
protected:
|
||||
wxMemoryStreamBase();
|
||||
virtual ~wxMemoryStreamBase();
|
||||
|
||||
bool ChangeBufferSize(size_t new_length);
|
||||
|
||||
protected:
|
||||
bool m_persistent;
|
||||
size_t m_length;
|
||||
char *m_buffer;
|
||||
int m_iolimit;
|
||||
};
|
||||
|
||||
class wxMemoryInputStream: public virtual wxMemoryStreamBase, public wxInputStream {
|
||||
class wxMemoryInputStream: public wxInputStream {
|
||||
public:
|
||||
wxMemoryInputStream(const char *data, size_t length);
|
||||
virtual ~wxMemoryInputStream();
|
||||
|
||||
char Peek();
|
||||
|
||||
protected:
|
||||
|
||||
size_t DoRead(void *buffer, size_t size);
|
||||
off_t DoSeekInput(off_t pos, wxSeekMode mode);
|
||||
off_t DoTellInput() const { return m_position_i; }
|
||||
|
||||
protected:
|
||||
off_t m_position_i;
|
||||
};
|
||||
|
||||
class wxMemoryOutputStream: public virtual wxMemoryStreamBase, public wxOutputStream {
|
||||
class wxMemoryOutputStream: public wxOutputStream {
|
||||
public:
|
||||
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
|
||||
virtual ~wxMemoryOutputStream();
|
||||
|
||||
char *GetData() { Sync(); return m_buffer; }
|
||||
size_t GetLength() { Sync(); return m_length; }
|
||||
|
||||
protected:
|
||||
|
||||
size_t DoWrite(const void *buffer, size_t size);
|
||||
off_t DoSeekOutput(off_t pos, wxSeekMode mode);
|
||||
off_t DoTellOutput() const { return m_position_o; }
|
||||
|
||||
protected:
|
||||
off_t m_position_o;
|
||||
};
|
||||
|
||||
class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {
|
||||
|
Reference in New Issue
Block a user