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

* wxFileInputStream and wxFileOutputStream doesn't inherit anymore from wxFile.

Browse Source 
* The destructor of wxFile isn't anymore virtual.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-09-04 17:32:11 +00:00
parent f05df5a85a
commit 25c70b07e6
3 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/fstream.h
View File

@@ -16,26 +16,30 @@
#include <wx/stream.h>
#include <wx/file.h>
class wxFileInputStream: public wxInputStream, virtual public wxFile {
class wxFileStreamBase {
protected:
wxFile *m_file;
bool m_file_destroy;
};
class wxFileInputStream: public wxInputStream, virtual public wxFileStreamBase {
public:
wxFileInputStream(const wxString& fileName);
virtual ~wxFileInputStream();
virtual char Peek();
virtual bool Eof() const { return wxFile::Eof(); }
bool Ok() const { return wxFile::IsOpened(); }
bool Ok() const { return m_file->IsOpened(); }
protected:
wxFileInputStream() {}
wxFileInputStream();
size_t DoRead(void *buffer, size_t size);
off_t DoSeekInput(off_t pos, wxSeekMode mode);
off_t DoTellInput() const;
};
class wxFileOutputStream: public wxOutputStream, virtual public wxFile {
class wxFileOutputStream: public wxOutputStream, virtual public wxFileStreamBase {
public:
wxFileOutputStream(const wxString& fileName);
virtual ~wxFileOutputStream();
@@ -46,10 +50,10 @@ class wxFileOutputStream: public wxOutputStream, virtual public wxFile {
void Sync();
bool Ok() const { return wxFile::IsOpened(); }
bool Ok() const { return m_file->IsOpened(); }
protected:
wxFileOutputStream() {}
wxFileOutputStream();
size_t DoWrite(const void *buffer, size_t size);
off_t DoSeekOutput(off_t pos, wxSeekMode mode);