* wxStream: I've rewritten the inheritance
* added wxZlib*Stream * updated makefiles and data.cpp * modified a bit wxFile so I can use it in wxFile*Stream git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -348,21 +348,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
||||
#include "wx/stream.h"
|
||||
#include "wx/fstream.h"
|
||||
#include "wx/mstream.h"
|
||||
#include "wx/zstream.h"
|
||||
#include "wx/datstrm.h"
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxInputStream, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxOutputStream, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS2(wxStream, wxInputStream, wxOutputStream)
|
||||
IMPLEMENT_CLASS(wxFilterInputStream, wxInputStream)
|
||||
IMPLEMENT_CLASS(wxFilterOutputStream, wxOutputStream)
|
||||
|
||||
IMPLEMENT_CLASS(wxFileStreamBase, wxStream)
|
||||
IMPLEMENT_CLASS(wxFileInputStream, wxFileStreamBase)
|
||||
IMPLEMENT_CLASS(wxFileOutputStream, wxFileStreamBase)
|
||||
IMPLEMENT_CLASS(wxFileInputStream, wxInputStream)
|
||||
IMPLEMENT_CLASS(wxFileOutputStream, wxOutputStream)
|
||||
IMPLEMENT_CLASS2(wxFileStream, wxFileInputStream, wxFileOutputStream)
|
||||
|
||||
IMPLEMENT_CLASS(wxMemoryStreamBase, wxStream)
|
||||
IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
|
||||
IMPLEMENT_CLASS(wxMemoryInputStream, wxInputStream)
|
||||
IMPLEMENT_CLASS(wxMemoryOutputStream, wxOutputStream)
|
||||
IMPLEMENT_CLASS2(wxMemoryStream, wxMemoryInputStream, wxMemoryOutputStream)
|
||||
|
||||
IMPLEMENT_CLASS(wxZlibInputStream, wxFilterInputStream)
|
||||
IMPLEMENT_CLASS(wxZlibOutputStream, wxFilterOutputStream)
|
||||
|
||||
IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
|
||||
IMPLEMENT_CLASS(wxDataOutputStream, wxFilterInputStream)
|
||||
|
Reference in New Issue
Block a user