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

Use "virtual" keyword with overridden methods.

Browse Source 
No real changes, just make the code more clear by explicitly using "virtual".

Closes #16097.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-19 18:06:29 +00:00
parent 7f48a077ab
commit 89bf39314f
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/generic/dvrenderers.h
View File

@@ -50,8 +50,8 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const;
virtual bool Render(wxRect cell, wxDC *dc, int state); virtual bool Render(wxRect cell, wxDC *dc, int state);
virtual wxSize GetSize() const; virtual wxSize GetSize() const;
@@ -80,11 +80,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const;
bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state );
wxSize GetSize() const; virtual wxSize GetSize() const;
private: private:
wxIcon m_icon; wxIcon m_icon;
@@ -105,11 +105,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const;
bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state );
wxSize GetSize() const; virtual wxSize GetSize() const;
// Implementation only, don't use nor override // Implementation only, don't use nor override
virtual bool WXActivateCell(const wxRect& cell, virtual bool WXActivateCell(const wxRect& cell,
@@ -136,8 +136,8 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value );
bool GetValue( wxVariant& value ) const; virtual bool GetValue( wxVariant& value ) const;
virtual bool Render(wxRect cell, wxDC *dc, int state); virtual bool Render(wxRect cell, wxDC *dc, int state);
virtual wxSize GetSize() const; virtual wxSize GetSize() const;
@@ -161,8 +161,8 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); virtual bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; virtual bool GetValue( wxVariant &value ) const;
virtual bool Render(wxRect cell, wxDC *dc, int state); virtual bool Render(wxRect cell, wxDC *dc, int state);
virtual wxSize GetSize() const; virtual wxSize GetSize() const;

26
include/wx/stream.h
View File

@@ -308,9 +308,9 @@ public:
wxFilterInputStream(wxInputStream *stream); wxFilterInputStream(wxInputStream *stream);
virtual ~wxFilterInputStream(); virtual ~wxFilterInputStream();
char Peek() { return m_parent_i_stream->Peek(); } virtual char Peek() { return m_parent_i_stream->Peek(); }
wxFileOffset GetLength() const { return m_parent_i_stream->GetLength(); } virtual wxFileOffset GetLength() const { return m_parent_i_stream->GetLength(); }
wxInputStream *GetFilterInputStream() const { return m_parent_i_stream; } wxInputStream *GetFilterInputStream() const { return m_parent_i_stream; }
@@ -330,7 +330,7 @@ public:
wxFilterOutputStream(wxOutputStream *stream); wxFilterOutputStream(wxOutputStream *stream);
virtual ~wxFilterOutputStream(); virtual ~wxFilterOutputStream();
wxFileOffset GetLength() const { return m_parent_o_stream->GetLength(); } virtual wxFileOffset GetLength() const { return m_parent_o_stream->GetLength(); }
wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; } wxOutputStream *GetFilterOutputStream() const { return m_parent_o_stream; }
@@ -561,13 +561,13 @@ public:
virtual ~wxBufferedInputStream(); virtual ~wxBufferedInputStream();
char Peek(); virtual char Peek();
wxInputStream& Read(void *buffer, size_t size); virtual wxInputStream& Read(void *buffer, size_t size);
// Position functions // Position functions
wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart); virtual wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart);
wxFileOffset TellI() const; virtual wxFileOffset TellI() const;
bool IsSeekable() const { return m_parent_i_stream->IsSeekable(); } virtual bool IsSeekable() const { return m_parent_i_stream->IsSeekable(); }
// the buffer given to the stream will be deleted by it // the buffer given to the stream will be deleted by it
void SetInputStreamBuffer(wxStreamBuffer *buffer); void SetInputStreamBuffer(wxStreamBuffer *buffer);
@@ -604,17 +604,17 @@ public:
virtual ~wxBufferedOutputStream(); virtual ~wxBufferedOutputStream();
wxOutputStream& Write(const void *buffer, size_t size); virtual wxOutputStream& Write(const void *buffer, size_t size);
// Position functions // Position functions
wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart); virtual wxFileOffset SeekO(wxFileOffset pos, wxSeekMode mode = wxFromStart);
wxFileOffset TellO() const; virtual wxFileOffset TellO() const;
bool IsSeekable() const { return m_parent_o_stream->IsSeekable(); } virtual bool IsSeekable() const { return m_parent_o_stream->IsSeekable(); }
void Sync(); void Sync();
bool Close(); bool Close();
wxFileOffset GetLength() const; virtual wxFileOffset GetLength() const;
// the buffer given to the stream will be deleted by it // the buffer given to the stream will be deleted by it
void SetOutputStreamBuffer(wxStreamBuffer *buffer); void SetOutputStreamBuffer(wxStreamBuffer *buffer);

50
include/wx/wfstream.h
View File

@@ -35,20 +35,20 @@ public:
wxFileInputStream(int fd); wxFileInputStream(int fd);
virtual ~wxFileInputStream(); virtual ~wxFileInputStream();
wxFileOffset GetLength() const; virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); } bool Ok() const { return IsOk(); }
virtual bool IsOk() const; virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFile* GetFile() const { return m_file; } wxFile* GetFile() const { return m_file; }
protected: protected:
wxFileInputStream(); wxFileInputStream();
size_t OnSysRead(void *buffer, size_t size); virtual size_t OnSysRead(void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const; virtual wxFileOffset OnSysTell() const;
protected: protected:
wxFile *m_file; wxFile *m_file;
@@ -67,20 +67,20 @@ public:
void Sync(); void Sync();
bool Close() { return m_file_destroy ? m_file->Close() : true; } bool Close() { return m_file_destroy ? m_file->Close() : true; }
wxFileOffset GetLength() const; virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); } bool Ok() const { return IsOk(); }
virtual bool IsOk() const; virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFile* GetFile() const { return m_file; } wxFile* GetFile() const { return m_file; }
protected: protected:
wxFileOutputStream(); wxFileOutputStream();
size_t OnSysWrite(const void *buffer, size_t size); virtual size_t OnSysWrite(const void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const; virtual wxFileOffset OnSysTell() const;
protected: protected:
wxFile *m_file; wxFile *m_file;
@@ -99,14 +99,14 @@ public:
WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); } WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); }
WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); } WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); }
wxFileOffset GetLength() const { return m_file->Length(); } virtual wxFileOffset GetLength() const { return m_file->Length(); }
bool IsSeekable() const { return true; } virtual bool IsSeekable() const { return true; }
protected: protected:
size_t OnSysWrite(const void *buffer, size_t size); virtual size_t OnSysWrite(const void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
{ return m_file->Seek(pos, mode); } { return m_file->Seek(pos, mode); }
wxFileOffset OnSysTell() const { return m_file->Tell(); } virtual wxFileOffset OnSysTell() const { return m_file->Tell(); }
private: private:
wxTempFile *m_file; wxTempFile *m_file;
@@ -166,20 +166,20 @@ public:
wxFFileInputStream(FILE *file); wxFFileInputStream(FILE *file);
virtual ~wxFFileInputStream(); virtual ~wxFFileInputStream();
wxFileOffset GetLength() const; virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); } bool Ok() const { return IsOk(); }
virtual bool IsOk() const; virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFFile* GetFile() const { return m_file; } wxFFile* GetFile() const { return m_file; }
protected: protected:
wxFFileInputStream(); wxFFileInputStream();
size_t OnSysRead(void *buffer, size_t size); virtual size_t OnSysRead(void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const; virtual wxFileOffset OnSysTell() const;
protected: protected:
wxFFile *m_file; wxFFile *m_file;
@@ -198,20 +198,20 @@ public:
void Sync(); void Sync();
bool Close() { return m_file_destroy ? m_file->Close() : true; } bool Close() { return m_file_destroy ? m_file->Close() : true; }
wxFileOffset GetLength() const; virtual wxFileOffset GetLength() const;
bool Ok() const { return IsOk(); } bool Ok() const { return IsOk(); }
virtual bool IsOk() const; virtual bool IsOk() const;
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } virtual bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
wxFFile* GetFile() const { return m_file; } wxFFile* GetFile() const { return m_file; }
protected: protected:
wxFFileOutputStream(); wxFFileOutputStream();
size_t OnSysWrite(const void *buffer, size_t size); virtual size_t OnSysWrite(const void *buffer, size_t size);
wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
wxFileOffset OnSysTell() const; virtual wxFileOffset OnSysTell() const;
protected: protected:
wxFFile *m_file; wxFFile *m_file;