* 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:
@@ -18,7 +18,7 @@
|
||||
|
||||
#include <wx/stream.h>
|
||||
|
||||
class wxDataInputStream: public virtual wxFilterInputStream {
|
||||
class wxDataInputStream: public wxFilterInputStream {
|
||||
public:
|
||||
wxDataInputStream(wxInputStream& s);
|
||||
virtual ~wxDataInputStream();
|
||||
@@ -31,7 +31,7 @@ public:
|
||||
wxString ReadString();
|
||||
};
|
||||
|
||||
class wxDataOutputStream: public virtual wxFilterOutputStream {
|
||||
class wxDataOutputStream: public wxFilterOutputStream {
|
||||
public:
|
||||
wxDataOutputStream(wxOutputStream& s);
|
||||
virtual ~wxDataOutputStream();
|
||||
@@ -44,11 +44,5 @@ class wxDataOutputStream: public virtual wxFilterOutputStream {
|
||||
void WriteString(const wxString& string);
|
||||
};
|
||||
|
||||
class wxDataStream: public wxDataInputStream, public wxDataOutputStream,
|
||||
public wxFilterStream {
|
||||
public:
|
||||
wxDataStream(wxStream& stream);
|
||||
};
|
||||
|
||||
#endif
|
||||
// _WX_DATSTREAM_H_
|
||||
|
Reference in New Issue
Block a user