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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index d329626d124763591fab22c9aa05fb6b4f5ee98c..8d5b759dcdd150a136c252f0162a92cada8bee31 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -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();

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 720beb4bf28f1cf48103cdfcd07cc6d477d69e76..8de99567f5282d9916bc89bb558082e79deec81a 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -16,6 +16,8 @@
 #pragma interface "filefn.h"
 #endif
 
+#include <wx/list.h>
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

diff --git a/include/wx/fstream.h b/include/wx/fstream.h
index 384a614bc4c9402715d73f26d67d060e1c36872a..bfa6ca698e7f4dbe210bdf165ddb4da02086555d 100644 (file)
--- a/include/wx/fstream.h
+++ b/include/wx/fstream.h
@@ -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();

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 641c0d42447fd967e1e12fe0aa3667d3fbb1497d..b239c36e67279a13d9a2c1371d91e1f205813feb 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -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();

diff --git a/include/wx/stream.h b/include/wx/stream.h
index d22e9c0f9e83a8d778072d4fb33c38758e5c0bee..c56b8c6171763966f0d444c18d1f4c048af15cc6 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -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();

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 34bb20f6728f908bb532262efc0a0c2d33ba67d1..9fec85d2a9bccbb57f2f49b828807aaddc70d339 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -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();

diff --git a/src/common/fstream.cpp b/src/common/fstream.cpp
index ea50fee90a8f6f1915c4e4525c3ab8dea8f66b3f..d1bfb0637bc0d4020de5e7ba0b73189491e59ca3 100644 (file)
--- a/src/common/fstream.cpp
+++ b/src/common/fstream.cpp
@@ -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
 // ----------------------------------------------------------------------------

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index d19b9755df77d996cd1c7d7dca0f632927b8d2e0..d75c423885488611d96b110427b79f05df7436ae 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -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
 // ----------------------------------------------------------------------------

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index a9c76aff5bb3a2bcb0cb6d758e4087c7c67f511d..1e5af54b38474316edbb6f4853cf86d2c2b2fb72 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -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()
 {
 }
 

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index de38cad39c295f4b418c447d19a0a17fc0a63dd2..8ff3bf5c60331c80bff16cc5bde9c8ef9fd645c9 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -23,11 +23,6 @@
 #pragma hdrstop
 #endif
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxZlibInputStream, wxFilterInputStream)
-IMPLEMENT_CLASS(wxZlibOutputStream, wxFilterOutputStream)
-#endif
-
 //////////////////////
 // wxZlibInputStream
 //////////////////////

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 1431dd4dc0c1293fa0cfc13f3bc821ca4fcd85db..42facd4ae83e0c4ba483c11da8e44d9df103e288 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -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)

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 1431dd4dc0c1293fa0cfc13f3bc821ca4fcd85db..42facd4ae83e0c4ba483c11da8e44d9df103e288 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -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)

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 55e92191a33d119a5e44498c46ab00c48939045d..a692201c45a2348476636ef3ef1ce9291af664d3 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -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)