Added IMPLEMENT_CLASS, ... about wxStream classes (I hope I didn't make mistakes).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,7 +18,8 @@
|
|||||||
|
|
||||||
#include <wx/stream.h>
|
#include <wx/stream.h>
|
||||||
|
|
||||||
class wxDataStream: public wxFilterInputStream {
|
class wxDataInputStream: public wxFilterInputStream {
|
||||||
|
DECLARE_CLASS(wxDataInputStream)
|
||||||
public:
|
public:
|
||||||
wxDataInputStream(wxInputStream& s);
|
wxDataInputStream(wxInputStream& s);
|
||||||
virtual ~wxDataInputStream();
|
virtual ~wxDataInputStream();
|
||||||
@@ -32,6 +33,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
class wxDataOutputStream: public wxFilterOutputStream {
|
class wxDataOutputStream: public wxFilterOutputStream {
|
||||||
|
DECLARE_CLASS(wxDataOutputStream)
|
||||||
public:
|
public:
|
||||||
wxDataOutputStream(wxOutputStream& s);
|
wxDataOutputStream(wxOutputStream& s);
|
||||||
virtual ~wxDataOutputStream();
|
virtual ~wxDataOutputStream();
|
||||||
|
@@ -14,6 +14,7 @@
|
|||||||
#include <wx/stream.h>
|
#include <wx/stream.h>
|
||||||
|
|
||||||
class wxMemoryStreamBase: public wxStream {
|
class wxMemoryStreamBase: public wxStream {
|
||||||
|
DECLARE_CLASS(wxMemoryStreamBase)
|
||||||
public:
|
public:
|
||||||
wxMemoryStreamBase(char *data, size_t length, int iolimit);
|
wxMemoryStreamBase(char *data, size_t length, int iolimit);
|
||||||
virtual ~wxMemoryStreamBase();
|
virtual ~wxMemoryStreamBase();
|
||||||
@@ -49,6 +50,7 @@ class wxMemoryStreamBase: public wxStream {
|
|||||||
|
|
||||||
|
|
||||||
class wxMemoryInputStream: public wxMemoryStreamBase {
|
class wxMemoryInputStream: public wxMemoryStreamBase {
|
||||||
|
DECLARE_CLASS(wxMemoryInputStream)
|
||||||
public:
|
public:
|
||||||
wxMemoryInputStream(char *data, size_t length)
|
wxMemoryInputStream(char *data, size_t length)
|
||||||
: wxMemoryStreamBase(data, length, 1)
|
: wxMemoryStreamBase(data, length, 1)
|
||||||
@@ -56,6 +58,7 @@ class wxMemoryInputStream: public wxMemoryStreamBase {
|
|||||||
};
|
};
|
||||||
|
|
||||||
class wxMemoryOutputStream: public wxMemoryStreamBase {
|
class wxMemoryOutputStream: public wxMemoryStreamBase {
|
||||||
|
DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
|
||||||
public:
|
public:
|
||||||
wxMemoryOutputStream(char *data = NULL, size_t length = 0)
|
wxMemoryOutputStream(char *data = NULL, size_t length = 0)
|
||||||
: wxMemoryStreamBase(data, length, 2)
|
: wxMemoryStreamBase(data, length, 2)
|
||||||
@@ -63,6 +66,7 @@ class wxMemoryOutputStream: public wxMemoryStreamBase {
|
|||||||
};
|
};
|
||||||
|
|
||||||
class wxMemoryStream: public wxMemoryStreamBase {
|
class wxMemoryStream: public wxMemoryStreamBase {
|
||||||
|
DECLARE_DYNAMIC_CLASS(wxMemoryStream)
|
||||||
public:
|
public:
|
||||||
wxMemoryStream(char *data = NULL, size_t length = 0)
|
wxMemoryStream(char *data = NULL, size_t length = 0)
|
||||||
: wxMemoryStreamBase(data, length, 0)
|
: wxMemoryStreamBase(data, length, 0)
|
||||||
|
@@ -30,7 +30,7 @@ typedef enum {
|
|||||||
|
|
||||||
class wxOutputStream;
|
class wxOutputStream;
|
||||||
class wxInputStream: public wxObject {
|
class wxInputStream: public wxObject {
|
||||||
DECLARE_ABSTRACT_CLASS(wxInputStream);
|
DECLARE_ABSTRACT_CLASS(wxInputStream)
|
||||||
public:
|
public:
|
||||||
wxInputStream();
|
wxInputStream();
|
||||||
virtual ~wxInputStream();
|
virtual ~wxInputStream();
|
||||||
@@ -46,7 +46,7 @@ class wxInputStream: public wxObject {
|
|||||||
};
|
};
|
||||||
|
|
||||||
class wxOutputStream: public wxObject {
|
class wxOutputStream: public wxObject {
|
||||||
DECLARE_ABSTRACT_CLASS(wxOutputStream);
|
DECLARE_ABSTRACT_CLASS(wxOutputStream)
|
||||||
public:
|
public:
|
||||||
wxOutputStream();
|
wxOutputStream();
|
||||||
virtual ~wxOutputStream();
|
virtual ~wxOutputStream();
|
||||||
|
@@ -26,6 +26,11 @@
|
|||||||
|
|
||||||
#include "wx/datstrm.h"
|
#include "wx/datstrm.h"
|
||||||
|
|
||||||
|
#if !USE_SHARED_LIBRARY
|
||||||
|
IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
|
||||||
|
IMPLEMENT_CLASS(wxDataOutputStream, wxFilterOutputStream)
|
||||||
|
#endif
|
||||||
|
|
||||||
wxDataInputStream::wxDataInputStream(wxInputStream& s)
|
wxDataInputStream::wxDataInputStream(wxInputStream& s)
|
||||||
: wxFilterInputStream(s)
|
: wxFilterInputStream(s)
|
||||||
{
|
{
|
||||||
|
@@ -17,6 +17,13 @@
|
|||||||
#include <wx/stream.h>
|
#include <wx/stream.h>
|
||||||
#include <wx/mstream.h>
|
#include <wx/mstream.h>
|
||||||
|
|
||||||
|
#if !USE_SHARED_LIBRARY
|
||||||
|
IMPLEMENT_CLASS(wxMemoryStreamBase, wxStream)
|
||||||
|
IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
|
||||||
|
#endif
|
||||||
|
|
||||||
wxMemoryStreamBase::wxMemoryStreamBase(char *data, size_t length, int iolimit)
|
wxMemoryStreamBase::wxMemoryStreamBase(char *data, size_t length, int iolimit)
|
||||||
{
|
{
|
||||||
m_buffer = data;
|
m_buffer = data;
|
||||||
|
@@ -345,6 +345,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
|
|||||||
#include "wx/process.h"
|
#include "wx/process.h"
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
||||||
|
|
||||||
|
#include "wx/stream.h"
|
||||||
|
#include "wx/fstream.h"
|
||||||
|
#include "wx/mstream.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(wxMemoryStreamBase, wxStream)
|
||||||
|
IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
|
||||||
|
|
||||||
|
IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
|
||||||
|
IMPLEMENT_CLASS(wxDataOutputStream, wxFilterInputStream)
|
||||||
|
|
||||||
#if USE_TIMEDATE
|
#if USE_TIMEDATE
|
||||||
#include "wx/date.h"
|
#include "wx/date.h"
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
|
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
|
||||||
|
@@ -345,6 +345,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
|
|||||||
#include "wx/process.h"
|
#include "wx/process.h"
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
||||||
|
|
||||||
|
#include "wx/stream.h"
|
||||||
|
#include "wx/fstream.h"
|
||||||
|
#include "wx/mstream.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(wxMemoryStreamBase, wxStream)
|
||||||
|
IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
|
||||||
|
|
||||||
|
IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
|
||||||
|
IMPLEMENT_CLASS(wxDataOutputStream, wxFilterInputStream)
|
||||||
|
|
||||||
#if USE_TIMEDATE
|
#if USE_TIMEDATE
|
||||||
#include "wx/date.h"
|
#include "wx/date.h"
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
|
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
|
||||||
|
@@ -359,6 +359,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
|
|||||||
#include "wx/process.h"
|
#include "wx/process.h"
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
||||||
|
|
||||||
|
#include "wx/stream.h"
|
||||||
|
#include "wx/fstream.h"
|
||||||
|
#include "wx/mstream.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(wxMemoryStreamBase, wxStream)
|
||||||
|
IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
|
||||||
|
|
||||||
|
IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
|
||||||
|
IMPLEMENT_CLASS(wxDataOutputStream, wxFilterInputStream)
|
||||||
|
|
||||||
#if USE_TIMEDATE
|
#if USE_TIMEDATE
|
||||||
#include "wx/date.h"
|
#include "wx/date.h"
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
|
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
|
||||||
|
Reference in New Issue
Block a user