Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxStream: wxInputStream and wxOutputStream don't inherit from wxObject anymore.

Browse Source 
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:
Guilhem Lavaux
1998-07-15 18:40:37 +00:00
parent ba7f9a90b4
commit e49f47aa77
13 changed files with 4 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/datstrm.h
View File

@@ -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();

2
include/wx/filefn.h
View File

@@ -16,6 +16,8 @@
#pragma interface "filefn.h"
#endif
#include <wx/list.h>
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------

3
include/wx/fstream.h
View File

@@ -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();

3
include/wx/mstream.h
View File

@@ -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();

8
include/wx/stream.h
View File

@@ -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();

2
include/wx/zstream.h
View File

@@ -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();

7
src/common/fstream.cpp
View File

@@ -23,15 +23,8 @@
#pragma hdrstop
#endif
#define BUF_TEMP_SIZE 10000
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxFileInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFileOutputStream, wxOutputStream)
IMPLEMENT_CLASS2(wxFileStream, wxInputStream, wxOutputStream)
#endif
// ----------------------------------------------------------------------------
// wxFileInputStream
// ----------------------------------------------------------------------------

6
src/common/mstream.cpp
View File

@@ -23,12 +23,6 @@
#pragma hdrstop
#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxMemoryInputStream, wxInputStream)
IMPLEMENT_CLASS(wxMemoryOutputStream, wxOutputStream)
IMPLEMENT_CLASS2(wxMemoryStream, wxInputStream, wxOutputStream)
#endif
// ----------------------------------------------------------------------------
// wxMemoryStreamBase
// ----------------------------------------------------------------------------

9
src/common/stream.cpp
View File

@@ -21,15 +21,7 @@
#pragma hdrstop
#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxInputStream, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxOutputStream, wxObject)
IMPLEMENT_CLASS(wxFilterInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFilterOutputStream, wxOutputStream)
#endif
wxInputStream::wxInputStream()
: wxObject()
{
}
@@ -53,7 +45,6 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
}
wxOutputStream::wxOutputStream()
: wxObject()
{
}

5
src/common/zstream.cpp
View File

@@ -23,11 +23,6 @@
#pragma hdrstop
#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxZlibInputStream, wxFilterInputStream)
IMPLEMENT_CLASS(wxZlibOutputStream, wxFilterOutputStream)
#endif
//////////////////////
// wxZlibInputStream
//////////////////////

24
src/gtk/data.cpp
View File

@@ -345,30 +345,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
#include "wx/process.h"
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_CLASS(wxFilterInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFilterOutputStream, wxOutputStream)
IMPLEMENT_CLASS(wxFileInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFileOutputStream, wxOutputStream)
IMPLEMENT_CLASS2(wxFileStream, wxFileInputStream, wxFileOutputStream)
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)
#if USE_TIMEDATE
#include "wx/date.h"
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)

24
src/gtk1/data.cpp
View File

@@ -345,30 +345,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
#include "wx/process.h"
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_CLASS(wxFilterInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFilterOutputStream, wxOutputStream)
IMPLEMENT_CLASS(wxFileInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFileOutputStream, wxOutputStream)
IMPLEMENT_CLASS2(wxFileStream, wxFileInputStream, wxFileOutputStream)
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)
#if USE_TIMEDATE
#include "wx/date.h"
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)

23
src/msw/data.cpp
View File

@@ -359,29 +359,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
#include "wx/process.h"
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_CLASS(wxFilterInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFilterOutputStream, wxOutputStream)
IMPLEMENT_CLASS(wxFileInputStream, wxInputStream)
IMPLEMENT_CLASS(wxFileOutputStream, wxOutputStream)
IMPLEMENT_CLASS2(wxFileStream, wxFileInputStream, wxFileOutputStream)
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)
#if USE_TIMEDATE
#include "wx/date.h"
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)