* some C++ness correction in wxStream.

* added support for DLL on Borland32
* fixed export bugs
* fixed a portability problem in socket.cpp
* added a missing function in utilsexc.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-09-08 17:19:16 +00:00
parent 6f5f3ca0fe
commit c740f49634
12 changed files with 165 additions and 26 deletions

View File

@@ -183,8 +183,8 @@ class WXDLLEXPORT wxOutputStream {
wxStreamBuffer *m_o_streambuf;
};
class wxStream: virtual public wxInputStream,
virtual public wxOutputStream
class wxStream: public virtual wxInputStream,
public virtual wxOutputStream
{
public:
wxStream();
@@ -194,7 +194,7 @@ class wxStream: virtual public wxInputStream,
// "Filter" streams
// ---------------------------------------------------------------------------
class WXDLLEXPORT wxFilterInputStream: virtual public wxInputStream {
class WXDLLEXPORT wxFilterInputStream: public virtual wxInputStream {
public:
wxFilterInputStream();
wxFilterInputStream(wxInputStream& stream);
@@ -215,7 +215,7 @@ class WXDLLEXPORT wxFilterInputStream: virtual public wxInputStream {
wxInputStream *m_parent_i_stream;
};
class WXDLLEXPORT wxFilterOutputStream: virtual public wxOutputStream {
class WXDLLEXPORT wxFilterOutputStream: public virtual wxOutputStream {
public:
wxFilterOutputStream();
wxFilterOutputStream(wxOutputStream& stream);
@@ -237,8 +237,8 @@ class WXDLLEXPORT wxFilterOutputStream: virtual public wxOutputStream {
};
class WXDLLEXPORT wxFilterStream: public wxStream,
virtual public wxFilterInputStream,
virtual public wxFilterOutputStream {
public virtual wxFilterInputStream,
public virtual wxFilterOutputStream {
public:
wxFilterStream(wxStream& stream);
wxFilterStream();