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

Add wxOVERRIDE and use it in common and wxOSX code.

Browse Source 
Make overriding virtual methods more explicit and enable additional checks
provided by C++11 compilers when "override" is used.

Closes #16100.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-20 13:26:28 +00:00
parent 34e4f66d6a
commit 33ad33d447
140 changed files with 865 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/richtext/richtextctrl.cpp
View File

@@ -88,7 +88,7 @@ class wxRichTextCaretTimer: public wxTimer
{
m_caret = caret;
}
virtual void Notify();
virtual void Notify() wxOVERRIDE;
wxRichTextCaret* m_caret;
};
@@ -111,8 +111,8 @@ public:
// --------------
// called by wxWindow (not using the event tables)
virtual void OnSetFocus();
virtual void OnKillFocus();
virtual void OnSetFocus() wxOVERRIDE;
virtual void OnKillFocus() wxOVERRIDE;
// draw the caret on the given DC
void DoDraw(wxDC *dc);
@@ -130,10 +130,10 @@ public:
void EnableRefresh(bool b) { m_refreshEnabled = b; }
protected:
virtual void DoShow();
virtual void DoHide();
virtual void DoMove();
virtual void DoSize();
virtual void DoShow() wxOVERRIDE;
virtual void DoHide() wxOVERRIDE;
virtual void DoMove() wxOVERRIDE;
virtual void DoSize() wxOVERRIDE;
// refresh the caret
void Refresh();