Add wxOVERRIDE and use it in common and wxOSX code.
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:
@@ -473,10 +473,10 @@ public:
|
||||
}
|
||||
|
||||
#if USES_WXPOPUPTRANSIENTWINDOW
|
||||
virtual bool Show( bool show );
|
||||
virtual bool ProcessLeftDown(wxMouseEvent& event);
|
||||
virtual bool Show( bool show ) wxOVERRIDE;
|
||||
virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE;
|
||||
protected:
|
||||
virtual void OnDismiss();
|
||||
virtual void OnDismiss() wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
private:
|
||||
@@ -946,7 +946,7 @@ public:
|
||||
wxComboCtrlTextCtrl() : wxTextCtrl() { }
|
||||
virtual ~wxComboCtrlTextCtrl() { }
|
||||
|
||||
virtual wxWindow *GetMainWindowOfCompositeControl()
|
||||
virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE
|
||||
{
|
||||
wxComboCtrl* combo = (wxComboCtrl*) GetParent();
|
||||
|
||||
|
Reference in New Issue
Block a user