wxStream: wxInputStream and wxOutputStream don't inherit from wxObject anymore.
Removed DECLARE* and IMPLEMENT* filefn.h: added #include "wx/list.h" to define wxStringList git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -19,7 +19,6 @@
|
||||
#include <wx/stream.h>
|
||||
|
||||
class wxDataInputStream: public wxFilterInputStream {
|
||||
DECLARE_CLASS(wxDataInputStream)
|
||||
public:
|
||||
wxDataInputStream(wxInputStream& s);
|
||||
virtual ~wxDataInputStream();
|
||||
@@ -33,7 +32,6 @@ public:
|
||||
};
|
||||
|
||||
class wxDataOutputStream: public wxFilterOutputStream {
|
||||
DECLARE_CLASS(wxDataOutputStream)
|
||||
public:
|
||||
wxDataOutputStream(wxOutputStream& s);
|
||||
virtual ~wxDataOutputStream();
|
||||
|
@@ -16,6 +16,8 @@
|
||||
#pragma interface "filefn.h"
|
||||
#endif
|
||||
|
||||
#include <wx/list.h>
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include <wx/file.h>
|
||||
|
||||
class wxFileInputStream: virtual public wxFile, public wxInputStream {
|
||||
DECLARE_CLASS(wxFileInputStream)
|
||||
public:
|
||||
wxFileInputStream(const wxString& fileName);
|
||||
virtual ~wxFileInputStream();
|
||||
@@ -41,7 +40,6 @@ class wxFileInputStream: virtual public wxFile, public wxInputStream {
|
||||
};
|
||||
|
||||
class wxFileOutputStream: virtual wxFile, public wxOutputStream {
|
||||
DECLARE_CLASS(wxFileOutputStream)
|
||||
public:
|
||||
wxFileOutputStream(const wxString& fileName);
|
||||
virtual ~wxFileOutputStream();
|
||||
@@ -66,7 +64,6 @@ class wxFileOutputStream: virtual wxFile, public wxOutputStream {
|
||||
};
|
||||
|
||||
class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
|
||||
DECLARE_CLASS(wxFileStream)
|
||||
public:
|
||||
wxFileStream(const wxString& fileName);
|
||||
virtual ~wxFileStream();
|
||||
|
@@ -28,7 +28,6 @@ class wxMemoryStreamBase {
|
||||
};
|
||||
|
||||
class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream {
|
||||
DECLARE_CLASS(wxMemoryInputStream)
|
||||
public:
|
||||
wxMemoryInputStream(const char *data, size_t length);
|
||||
virtual ~wxMemoryInputStream();
|
||||
@@ -47,7 +46,6 @@ class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStre
|
||||
};
|
||||
|
||||
class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
|
||||
DECLARE_CLASS(wxMemoryOutputStream)
|
||||
public:
|
||||
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
|
||||
virtual ~wxMemoryOutputStream();
|
||||
@@ -69,7 +67,6 @@ class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputSt
|
||||
};
|
||||
|
||||
class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {
|
||||
DECLARE_CLASS(wxMemoryStream)
|
||||
public:
|
||||
wxMemoryStream(char *data = NULL, size_t length = 0);
|
||||
virtual ~wxMemoryStream();
|
||||
|
@@ -25,8 +25,7 @@
|
||||
* wxStream: base classes
|
||||
*/
|
||||
class wxOutputStream;
|
||||
class wxInputStream: virtual public wxObject {
|
||||
DECLARE_ABSTRACT_CLASS(wxInputStream)
|
||||
class wxInputStream {
|
||||
public:
|
||||
wxInputStream();
|
||||
virtual ~wxInputStream();
|
||||
@@ -43,8 +42,7 @@ class wxInputStream: virtual public wxObject {
|
||||
wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }
|
||||
};
|
||||
|
||||
class wxOutputStream: virtual public wxObject {
|
||||
DECLARE_ABSTRACT_CLASS(wxOutputStream)
|
||||
class wxOutputStream {
|
||||
public:
|
||||
wxOutputStream();
|
||||
virtual ~wxOutputStream();
|
||||
@@ -66,7 +64,6 @@ class wxOutputStream: virtual public wxObject {
|
||||
*/
|
||||
|
||||
class wxFilterInputStream: public wxInputStream {
|
||||
DECLARE_CLASS(wxFilterInputStream)
|
||||
public:
|
||||
wxFilterInputStream(wxInputStream& stream);
|
||||
virtual ~wxFilterInputStream();
|
||||
@@ -86,7 +83,6 @@ class wxFilterInputStream: public wxInputStream {
|
||||
};
|
||||
|
||||
class wxFilterOutputStream: public wxOutputStream {
|
||||
DECLARE_CLASS(wxFilterOutputStream)
|
||||
public:
|
||||
wxFilterOutputStream(wxOutputStream& stream);
|
||||
virtual ~wxFilterOutputStream();
|
||||
|
@@ -19,7 +19,6 @@
|
||||
#include "zlib.h"
|
||||
|
||||
class wxZlibInputStream: public wxFilterInputStream {
|
||||
DECLARE_CLASS(wxZlibInputStream)
|
||||
public:
|
||||
wxZlibInputStream(wxInputStream& stream);
|
||||
virtual ~wxZlibInputStream();
|
||||
@@ -40,7 +39,6 @@ class wxZlibInputStream: public wxFilterInputStream {
|
||||
};
|
||||
|
||||
class wxZlibOutputStream: public wxFilterOutputStream {
|
||||
DECLARE_CLASS(wxZlibOutputStream)
|
||||
public:
|
||||
wxZlibOutputStream(wxOutputStream& stream);
|
||||
virtual ~wxZlibOutputStream();
|
||||
|
Reference in New Issue
Block a user