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

* wxSocket fixes

Browse Source 
* wxStream: - new inheritance, new stream buffer, nearly the same API for the
              end user
            - updated other streams consequently
* wxGTK: some change to make it compile on GTK 1.0 and GTK 1.1
* small changes on wxThread to prepare a more reentrant lib
* wxVariant works with wxStream too now


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-10-14 17:36:50 +00:00
parent 1b19f0560f
commit 75ed1d15d0
30 changed files with 706 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/wx/fstream.h
View File

@@ -21,23 +21,11 @@
#include <wx/stream.h>
#include <wx/file.h>
// Disable warnings such as
// 'wxFileStream' : inherits 'wxFileInputStream::Peek' via dominance
#ifdef _MSC_VER
#pragma warning(disable:4250)
#endif
class wxFileStreamBase {
protected:
wxFile *m_file;
bool m_file_destroy;
};
class wxFileInputStream: public virtual wxInputStream,
public virtual wxFileStreamBase {
class wxFileInputStream: public wxInputStream {
public:
wxFileInputStream(const wxString& fileName);
wxFileInputStream(const wxString& ifileName);
wxFileInputStream(wxFile& file);
wxFileInputStream(int fd);
virtual ~wxFileInputStream();
virtual char Peek();
@@ -47,15 +35,20 @@ class wxFileInputStream: public virtual wxInputStream,
protected:
wxFileInputStream();
size_t DoRead(void *buffer, size_t size);
off_t DoSeekInput(off_t pos, wxSeekMode mode);
off_t DoTellInput() const;
size_t OnSysRead(void *buffer, size_t size);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
protected:
wxFile *m_file;
bool m_file_destroy;
};
class wxFileOutputStream: public virtual wxOutputStream,
public virtual wxFileStreamBase {
class wxFileOutputStream: public wxOutputStream {
public:
wxFileOutputStream(const wxString& fileName);
wxFileOutputStream(wxFile& file);
wxFileOutputStream(int fd);
virtual ~wxFileOutputStream();
// To solve an ambiguity on GCC
@@ -69,20 +62,13 @@ class wxFileOutputStream: public virtual wxOutputStream,
protected:
wxFileOutputStream();
size_t DoWrite(const void *buffer, size_t size);
off_t DoSeekOutput(off_t pos, wxSeekMode mode);
off_t DoTellOutput() const;
size_t OnSysWrite(const void *buffer, size_t size);
off_t OnSysSeek(off_t pos, wxSeekMode mode);
off_t OnSysTell() const;
protected:
wxFile *m_file;
bool m_file_destroy;
};
class wxFileStream: public wxStream,
public wxFileInputStream, public wxFileOutputStream {
public:
wxFileStream(const wxString& fileName);
virtual ~wxFileStream();
};
#ifdef _MSC_VER
#pragma warning(default:4250)
#endif
#endif