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

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)