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

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/wx/stream.h
View File

@@ -280,14 +280,14 @@ class WXDLLIMPEXP_BASE wxCountingOutputStream : public wxOutputStream
public:
wxCountingOutputStream();
virtual wxFileOffset GetLength() const;
virtual wxFileOffset GetLength() const wxOVERRIDE;
bool Ok() const { return IsOk(); }
virtual bool IsOk() const { return true; }
virtual bool IsOk() const wxOVERRIDE { return true; }
protected:
virtual size_t OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
virtual size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE;
size_t m_currentPos,
m_lastPos;
@@ -308,9 +308,9 @@ public:
wxFilterInputStream(wxInputStream *stream);
virtual ~wxFilterInputStream();
virtual char Peek() { return m_parent_i_stream->Peek(); }
virtual char Peek() wxOVERRIDE { return m_parent_i_stream->Peek(); }
virtual wxFileOffset GetLength() const { return m_parent_i_stream->GetLength(); }
virtual wxFileOffset GetLength() const wxOVERRIDE { return m_parent_i_stream->GetLength(); }
wxInputStream *GetFilterInputStream() const { return m_parent_i_stream; }
@@ -330,11 +330,11 @@ public:
wxFilterOutputStream(wxOutputStream *stream);
virtual ~wxFilterOutputStream();
virtual wxFileOffset GetLength() const { return m_parent_o_stream->GetLength(); }
virtual wxFileOffset GetLength() const wxOVERRIDE { return m_parent_o_stream->GetLength(); }
wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; }
bool Close();
bool Close() wxOVERRIDE;
protected:
wxOutputStream *m_parent_o_stream;
@@ -561,22 +561,22 @@ public:
virtual ~wxBufferedInputStream();
virtual char Peek();
virtual wxInputStream& Read(void *buffer, size_t size);
virtual char Peek() wxOVERRIDE;
virtual wxInputStream& Read(void *buffer, size_t size) wxOVERRIDE;
// Position functions
virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart);
virtual wxFileOffset TellI() const;
virtual bool IsSeekable() const { return m_parent_i_stream->IsSeekable(); }
virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxOVERRIDE;
virtual wxFileOffset TellI() const wxOVERRIDE;
virtual bool IsSeekable() const wxOVERRIDE { return m_parent_i_stream->IsSeekable(); }
// the buffer given to the stream will be deleted by it
void SetInputStreamBuffer(wxStreamBuffer *buffer);
wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
protected:
virtual size_t OnSysRead(void *buffer, size_t bufsize);
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
virtual size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE;
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE;
wxStreamBuffer *m_i_streambuf;
@@ -604,26 +604,26 @@ public:
virtual ~wxBufferedOutputStream();
virtual wxOutputStream& Write(const void *buffer, size_t size);
virtual wxOutputStream& Write(const void *buffer, size_t size) wxOVERRIDE;
// Position functions
virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
virtual wxFileOffset TellO() const;
virtual bool IsSeekable() const { return m_parent_o_stream->IsSeekable(); }
virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxOVERRIDE;
virtual wxFileOffset TellO() const wxOVERRIDE;
virtual bool IsSeekable() const wxOVERRIDE { return m_parent_o_stream->IsSeekable(); }
void Sync();
bool Close();
void Sync() wxOVERRIDE;
bool Close() wxOVERRIDE;
virtual wxFileOffset GetLength() const;
virtual wxFileOffset GetLength() const wxOVERRIDE;
// the buffer given to the stream will be deleted by it
void SetOutputStreamBuffer(wxStreamBuffer *buffer);
wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
protected:
virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
virtual size_t OnSysWrite(const void *buffer, size_t bufsize) wxOVERRIDE;
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE;
wxStreamBuffer *m_o_streambuf;
@@ -647,13 +647,13 @@ public:
wxWrapperInputStream(wxInputStream* stream);
// Override the base class methods to forward to the wrapped stream.
virtual wxFileOffset GetLength() const;
virtual bool IsSeekable() const;
virtual wxFileOffset GetLength() const wxOVERRIDE;
virtual bool IsSeekable() const wxOVERRIDE;
protected:
virtual size_t OnSysRead(void *buffer, size_t size);
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
virtual wxFileOffset OnSysTell() const;
virtual size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
virtual wxFileOffset OnSysTell() const wxOVERRIDE;
// Ensure that our own last error is the same as that of the real stream.
//