From d148c39c2d1c2841bc6540c5644e54405d1cb604 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 12 Jul 2017 11:38:44 -0400 Subject: [PATCH] More use of override --- .../notetrack/ui/StretchHandle.h | 19 ++++++++------- src/tracks/ui/SelectHandle.h | 24 ++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h index 150caaa7d..a52f61b6f 100644 --- a/src/tracks/playabletrack/notetrack/ui/StretchHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/StretchHandle.h @@ -71,20 +71,21 @@ public: virtual ~StretchHandle(); - virtual Result Click - (const TrackPanelMouseEvent &event, AudacityProject *pProject); + Result Click + (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; - virtual Result Drag - (const TrackPanelMouseEvent &event, AudacityProject *pProject); + Result Drag + (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; - virtual HitTestPreview Preview - (const TrackPanelMouseState &state, const AudacityProject *pProject); + HitTestPreview Preview + (const TrackPanelMouseState &state, const AudacityProject *pProject) + override; - virtual Result Release + Result Release (const TrackPanelMouseEvent &event, AudacityProject *pProject, - wxWindow *pParent); + wxWindow *pParent) override; - virtual Result Cancel(AudacityProject *pProject); + Result Cancel(AudacityProject *pProject) override; bool StopsOnKeystroke() override { return true; } diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h index 79d610ab8..981a7f13b 100644 --- a/src/tracks/ui/SelectHandle.h +++ b/src/tracks/ui/SelectHandle.h @@ -46,24 +46,26 @@ public: bool IsClicked() const; - virtual Result Click - (const TrackPanelMouseEvent &event, AudacityProject *pProject); + Result Click + (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; - virtual Result Drag - (const TrackPanelMouseEvent &event, AudacityProject *pProject); + Result Drag + (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; - virtual HitTestPreview Preview - (const TrackPanelMouseState &state, const AudacityProject *pProject); + HitTestPreview Preview + (const TrackPanelMouseState &state, const AudacityProject *pProject) + override; - virtual Result Release + Result Release (const TrackPanelMouseEvent &event, AudacityProject *pProject, - wxWindow *pParent); + wxWindow *pParent) override; - virtual Result Cancel(AudacityProject*); + Result Cancel(AudacityProject*) override; - virtual void DrawExtras + void DrawExtras (DrawingPass pass, - wxDC * dc, const wxRegion &updateRegion, const wxRect &panelRect); + wxDC * dc, const wxRegion &updateRegion, const wxRect &panelRect) + override; // Receives timer event notifications, to implement auto-scroll void OnTimer(wxCommandEvent &event);