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

* some C++ness correction in wxStream.

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/datstrm.h
View File

@@ -18,7 +18,7 @@
#include <wx/stream.h>
class wxDataInputStream: virtual public wxFilterInputStream {
class wxDataInputStream: public virtual wxFilterInputStream {
public:
wxDataInputStream(wxInputStream& s);
virtual ~wxDataInputStream();
@@ -31,7 +31,7 @@ public:
wxString ReadString();
};
class wxDataOutputStream: virtual public wxFilterOutputStream {
class wxDataOutputStream: public virtual wxFilterOutputStream {
public:
wxDataOutputStream(wxOutputStream& s);
virtual ~wxDataOutputStream();

2
include/wx/debug.h
View File

@@ -51,7 +51,7 @@
@param szFile and nLine - file name and line number of the ASSERT
szMsg - optional message explaining the reason
*/
void wxOnAssert(const char *szFile, int nLine, const char *szMsg = (const char *) NULL);
void WXDLLEXPORT wxOnAssert(const char *szFile, int nLine, const char *szMsg = (const char *) NULL);
/// generic assert macro
#define wxASSERT(cond) if ( !(cond) ) wxOnAssert(__FILE__, __LINE__)

8
include/wx/fstream.h
View File

@@ -22,8 +22,8 @@ protected:
bool m_file_destroy;
};
class wxFileInputStream: virtual public wxInputStream,
virtual public wxFileStreamBase {
class wxFileInputStream: public virtual wxInputStream,
public virtual wxFileStreamBase {
public:
wxFileInputStream(const wxString& fileName);
virtual ~wxFileInputStream();
@@ -40,8 +40,8 @@ class wxFileInputStream: virtual public wxInputStream,
off_t DoTellInput() const;
};
class wxFileOutputStream: virtual public wxOutputStream,
virtual public wxFileStreamBase {
class wxFileOutputStream: public virtual wxOutputStream,
public virtual wxFileStreamBase {
public:
wxFileOutputStream(const wxString& fileName);
virtual ~wxFileOutputStream();

2
include/wx/intl.h
View File

@@ -115,7 +115,7 @@ private:
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
WXDLLEXPORT wxLocale* wxGetLocale();
wxLocale* WXDLLEXPORT wxGetLocale();
// get the translation of the string in the current locale
inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)

4
include/wx/mstream.h
View File

@@ -27,7 +27,7 @@ class wxMemoryStreamBase {
int m_iolimit;
};
class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream {
class wxMemoryInputStream: public virtual wxMemoryStreamBase, public wxInputStream {
public:
wxMemoryInputStream(const char *data, size_t length);
virtual ~wxMemoryInputStream();
@@ -44,7 +44,7 @@ class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStre
off_t m_position_i;
};
class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
class wxMemoryOutputStream: public virtual wxMemoryStreamBase, public wxOutputStream {
public:
wxMemoryOutputStream(char *data = NULL, size_t length = 0);
virtual ~wxMemoryOutputStream();

12
include/wx/stream.h
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();