From 31231a54d2ed2b4e40f9b5e7bcbee14cd5cb3f98 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 1 Oct 2017 13:28:04 -0400 Subject: [PATCH] use override --- include/audacity/EffectAutomationParameters.h | 16 ++++++------ src/LabelDialog.h | 4 +-- src/TimeDialog.h | 4 +-- src/TimerRecordDialog.h | 5 +++- src/effects/Effect.h | 4 +-- src/effects/NoiseReduction.cpp | 4 +-- src/effects/NoiseRemoval.h | 4 +-- src/effects/Phaser.h | 4 +-- src/effects/Reverb.h | 4 +-- src/effects/ScoreAlignDialog.h | 2 +- src/effects/ToneGen.h | 4 +-- src/effects/VST/VSTEffect.cpp | 26 +++++++++---------- src/effects/lv2/LV2Effect.h | 4 +-- src/export/ExportCL.cpp | 6 ++--- src/export/ExportFFmpeg.cpp | 2 +- src/export/ExportFFmpegDialogs.h | 20 +++++++------- src/export/ExportFLAC.cpp | 6 ++--- src/export/ExportMP2.cpp | 6 ++--- src/export/ExportMP3.cpp | 6 ++--- src/export/ExportOGG.cpp | 4 +-- src/export/ExportPCM.cpp | 6 ++--- src/toolbars/ControlToolBar.h | 6 ++--- src/toolbars/DeviceToolBar.h | 6 ++--- src/toolbars/EditToolBar.h | 10 +++---- src/toolbars/MeterToolBar.h | 8 +++--- src/toolbars/MixerToolBar.h | 4 +-- src/toolbars/ScrubbingToolBar.h | 6 ++--- src/toolbars/SelectionBar.h | 2 +- src/toolbars/SpectralSelectionBar.h | 2 +- src/toolbars/ToolBar.h | 2 +- src/toolbars/ToolsToolBar.h | 4 +-- src/toolbars/TranscriptionToolBar.h | 2 +- src/widgets/ASlider.h | 4 +-- 33 files changed, 100 insertions(+), 97 deletions(-) diff --git a/include/audacity/EffectAutomationParameters.h b/include/audacity/EffectAutomationParameters.h index bce9bd2dc..03c21ba39 100644 --- a/include/audacity/EffectAutomationParameters.h +++ b/include/audacity/EffectAutomationParameters.h @@ -65,27 +65,27 @@ public: { } - virtual bool HasGroup(const wxString & strName) const + virtual bool HasGroup(const wxString & strName) const override { return wxFileConfig::HasGroup(NormalizeName(strName)); } - virtual bool HasEntry(const wxString& strName) const + virtual bool HasEntry(const wxString& strName) const override { return wxFileConfig::HasEntry(NormalizeName(strName)); } - virtual bool DoReadString(const wxString & key, wxString *pStr) const + virtual bool DoReadString(const wxString & key, wxString *pStr) const override { return wxFileConfig::DoReadString(NormalizeName(key), pStr); } - virtual bool DoReadLong(const wxString & key, long *pl) const + virtual bool DoReadLong(const wxString & key, long *pl) const override { return wxFileConfig::DoReadLong(NormalizeName(key), pl); } - virtual bool DoReadDouble(const wxString & key, double *pd) const + virtual bool DoReadDouble(const wxString & key, double *pd) const override { wxString str; if (Read(key, &str)) @@ -102,17 +102,17 @@ public: return false; } - virtual bool DoWriteString(const wxString & key, const wxString & szValue) + virtual bool DoWriteString(const wxString & key, const wxString & szValue) override { return wxFileConfig::DoWriteString(NormalizeName(key), szValue); } - virtual bool DoWriteLong(const wxString & key, long lValue) + virtual bool DoWriteLong(const wxString & key, long lValue) override { return wxFileConfig::DoWriteLong(NormalizeName(key), lValue); } - virtual bool DoWriteDouble(const wxString & key, double value) + virtual bool DoWriteDouble(const wxString & key, double value) override { return DoWriteString(key, wxString::Format(wxT("%.12f"), value)); } diff --git a/src/LabelDialog.h b/src/LabelDialog.h index ceb3dad03..d351249bd 100644 --- a/src/LabelDialog.h +++ b/src/LabelDialog.h @@ -54,8 +54,8 @@ class LabelDialog final : public wxDialogWrapper private: - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; bool Validate(); void FindAllLabels(); void AddLabels(const LabelTrack *t); diff --git a/src/TimeDialog.h b/src/TimeDialog.h index ffe10ce31..4aadba509 100644 --- a/src/TimeDialog.h +++ b/src/TimeDialog.h @@ -39,8 +39,8 @@ class TimeDialog final : public wxDialogWrapper private: void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; void OnUpdate(wxCommandEvent &event); diff --git a/src/TimerRecordDialog.h b/src/TimerRecordDialog.h index 47ff470f4..95d957997 100644 --- a/src/TimerRecordDialog.h +++ b/src/TimerRecordDialog.h @@ -78,7 +78,10 @@ private: wxString GetDisplayDate(wxDateTime & dt); void PopulateOrExchange(ShuttleGui& S); - bool TransferDataFromWindow(); + + bool TransferDataFromWindow() override; + // no TransferDataFromWindow() because ?? + void UpdateDuration(); // Update m_TimeSpan_Duration and ctrl based on m_DateTime_Start and m_DateTime_End. void UpdateEnd(); // Update m_DateTime_End and ctrls based on m_DateTime_Start and m_TimeSpan_Duration. ProgressResult WaitForStart(); diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 0af69289a..10806f76f 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -317,8 +317,8 @@ protected: virtual void Preview(bool dryOnly); virtual void PopulateOrExchange(ShuttleGui & S); - virtual bool TransferDataToWindow(); - virtual bool TransferDataFromWindow(); + virtual bool TransferDataToWindow() /* not override */; + virtual bool TransferDataFromWindow() /* not override */; virtual bool EnableApply(bool enable = true); virtual bool EnablePreview(bool enable = true); virtual void EnableDebug(bool enable = true); diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 55bea20c4..275af2c02 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -365,8 +365,8 @@ public: bool bAllowTwiddleSettings); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; const Settings &GetTempSettings() const { return mTempSettings; } diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index 3e888aa2a..375429a92 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -146,8 +146,8 @@ public: bool set_sizer = true); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; private: // handlers diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h index 151a9945f..6ae047e30 100644 --- a/src/effects/Phaser.h +++ b/src/effects/Phaser.h @@ -82,8 +82,8 @@ public: // Effect implementation void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; private: // EffectPhaser implementation diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h index c3e49ac18..1efb5ae84 100644 --- a/src/effects/Reverb.h +++ b/src/effects/Reverb.h @@ -72,8 +72,8 @@ public: bool Startup(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; private: // EffectReverb implementation diff --git a/src/effects/ScoreAlignDialog.h b/src/effects/ScoreAlignDialog.h index dd579181c..401a3bfea 100644 --- a/src/effects/ScoreAlignDialog.h +++ b/src/effects/ScoreAlignDialog.h @@ -64,7 +64,7 @@ public: ScoreAlignDialog(ScoreAlignParams ¶ms); ~ScoreAlignDialog(); - bool TransferDataFromWindow(); + bool TransferDataFromWindow() override; private: enum { diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h index c556246f7..60f172fc1 100644 --- a/src/effects/ToneGen.h +++ b/src/effects/ToneGen.h @@ -52,8 +52,8 @@ public: // Effect implementation void PopulateOrExchange(ShuttleGui & S); - bool TransferDataFromWindow(); - bool TransferDataToWindow(); + bool TransferDataFromWindow() override; + bool TransferDataToWindow() override; private: // EffectToneGen implementation diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 9ae46a844..9eebfa119 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -187,67 +187,67 @@ public: // EffectClientInterface implementation - wxString GetPath() + wxString GetPath() override { return mPath; } - wxString GetSymbol() + wxString GetSymbol() override { return mName; } - wxString GetName() + wxString GetName() override { return GetSymbol(); } - wxString GetVendor() + wxString GetVendor() override { return mVendor; } - wxString GetVersion() + wxString GetVersion() override { return mVersion; } - wxString GetDescription() + wxString GetDescription() override { return mDescription; } - wxString GetFamily() + wxString GetFamily() override { return VSTPLUGINTYPE; } - EffectType GetType() + EffectType GetType() override { return mType; } - bool IsInteractive() + bool IsInteractive() override { return mInteractive; } - bool IsDefault() + bool IsDefault() override { return false; } - bool IsLegacy() + bool IsLegacy() override { return false; } - bool SupportsRealtime() + bool SupportsRealtime() override { return mType == EffectTypeProcess; } - bool SupportsAutomation() + bool SupportsAutomation() override { return mAutomatable; } diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index a30919702..ffed0a8ac 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -213,8 +213,8 @@ private: bool BuildFancy(); bool BuildPlain(); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() /* not override */; + bool TransferDataFromWindow() /* not override */; void SetSlider(wxSlider *slider, const LV2Port & ctrl); void OnTrigger(wxCommandEvent & evt); diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index 5fe7346c3..941a33ac7 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -48,8 +48,8 @@ public: virtual ~ExportCLOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; void OnBrowse(wxCommandEvent & event); @@ -284,7 +284,7 @@ public: ExportCL(); // Required - wxWindow *OptionsCreate(wxWindow *parent, int format); + wxWindow *OptionsCreate(wxWindow *parent, int format) override; ProgressResult Export(AudacityProject *project, unsigned channels, diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp index a3f7e9dba..878a5ed46 100644 --- a/src/export/ExportFFmpeg.cpp +++ b/src/export/ExportFFmpeg.cpp @@ -122,7 +122,7 @@ public: /// Creates options panel ///\param format - index of export type - wxWindow *OptionsCreate(wxWindow *parent, int format); + wxWindow *OptionsCreate(wxWindow *parent, int format) override; /// Check whether or not current project sample rate is compatible with the export codec bool CheckSampleRate(int rate, int lowrate, int highrate, const int *sampRates); diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h index 6370d318e..ce3f3afe5 100644 --- a/src/export/ExportFFmpegDialogs.h +++ b/src/export/ExportFFmpegDialogs.h @@ -69,8 +69,8 @@ public: virtual ~ExportFFmpegAC3Options(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; /// Bit Rates supported by AC3 encoder static const int iAC3BitRates[]; @@ -95,8 +95,8 @@ public: virtual ~ExportFFmpegAACOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; private: @@ -111,8 +111,8 @@ public: virtual ~ExportFFmpegAMRNBOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; static int iAMRNBBitRate[]; @@ -133,8 +133,8 @@ public: ~ExportFFmpegWMAOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; static const int iWMASampleRates[]; static const int iWMABitRate[]; @@ -156,8 +156,8 @@ public: ~ExportFFmpegCustomOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; void OnOpen(wxCommandEvent & evt); diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index b3d376990..b02da6b5d 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -55,8 +55,8 @@ public: virtual ~ExportFLACOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; }; /// @@ -189,7 +189,7 @@ public: // Required - wxWindow *OptionsCreate(wxWindow *parent, int format); + wxWindow *OptionsCreate(wxWindow *parent, int format) override; ProgressResult Export(AudacityProject *project, unsigned channels, const wxString &fName, diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index 1bc651f0c..6d2400671 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -89,8 +89,8 @@ public: virtual ~ExportMP2Options(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; private: wxArrayString mBitRateNames; @@ -172,7 +172,7 @@ public: // Required - wxWindow *OptionsCreate(wxWindow *parent, int format); + wxWindow *OptionsCreate(wxWindow *parent, int format) override; ProgressResult Export(AudacityProject *project, unsigned channels, const wxString &fName, diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index ef7b3cfa7..523949c2d 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -271,8 +271,8 @@ public: virtual ~ExportMP3Options(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; void OnSET(wxCommandEvent& evt); void OnVBR(wxCommandEvent& evt); @@ -1601,7 +1601,7 @@ public: // Required - wxWindow *OptionsCreate(wxWindow *parent, int format); + wxWindow *OptionsCreate(wxWindow *parent, int format) override; ProgressResult Export(AudacityProject *project, unsigned channels, const wxString &fName, diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index 12f6e951e..6b0010151 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -50,8 +50,8 @@ public: virtual ~ExportOGGOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; private: diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index 855e17ef5..896db96a2 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -101,8 +101,8 @@ public: virtual ~ExportPCMOptions(); void PopulateOrExchange(ShuttleGui & S); - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; void OnHeaderChoice(wxCommandEvent & evt); @@ -317,7 +317,7 @@ public: // Required - wxWindow *OptionsCreate(wxWindow *parent, int format); + wxWindow *OptionsCreate(wxWindow *parent, int format) override; ProgressResult Export(AudacityProject *project, unsigned channels, const wxString &fName, diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h index fd3fda5cf..4182e5c35 100644 --- a/src/toolbars/ControlToolBar.h +++ b/src/toolbars/ControlToolBar.h @@ -46,9 +46,9 @@ class ControlToolBar final : public ToolBar { ControlToolBar(); virtual ~ControlToolBar(); - void Create(wxWindow *parent); + void Create(wxWindow *parent) override; - void UpdatePrefs(); + void UpdatePrefs() override; void OnKeyEvent(wxKeyEvent & event); // msmeyer: These are public, but it's far better to @@ -97,7 +97,7 @@ class ControlToolBar final : public ToolBar { // Pause - used by AudioIO to pause sound activate recording void Pause(); - void Populate(); + void Populate() override; void Repaint(wxDC *dc) override; void EnableDisableButtons() override; diff --git a/src/toolbars/DeviceToolBar.h b/src/toolbars/DeviceToolBar.h index c5838f29d..c05c64e3a 100644 --- a/src/toolbars/DeviceToolBar.h +++ b/src/toolbars/DeviceToolBar.h @@ -29,9 +29,9 @@ class DeviceToolBar final : public ToolBar { DeviceToolBar(); virtual ~DeviceToolBar(); - void Create(wxWindow * parent); + void Create(wxWindow * parent) override; - void UpdatePrefs(); + void UpdatePrefs() override; void DeinitChildren(); void Populate() override; @@ -45,7 +45,7 @@ class DeviceToolBar final : public ToolBar { /// When the prefs don't exist this value is used. /// It should be small enough to work on tiny screens - int GetInitialWidth() { return 620; } + int GetInitialWidth() override{ return 620; } int GetMinToolbarWidth() override { return 200; } void ShowInputDialog(); diff --git a/src/toolbars/EditToolBar.h b/src/toolbars/EditToolBar.h index e6c8d64f5..7ae802970 100644 --- a/src/toolbars/EditToolBar.h +++ b/src/toolbars/EditToolBar.h @@ -76,14 +76,14 @@ class EditToolBar final : public ToolBar { EditToolBar(); virtual ~EditToolBar(); - void Create(wxWindow *parent); + void Create(wxWindow *parent) override; void OnButton(wxCommandEvent & event); - void Populate(); - void Repaint(wxDC * WXUNUSED(dc)) {}; - void EnableDisableButtons(); - void UpdatePrefs(); + void Populate() override; + void Repaint(wxDC * WXUNUSED(dc)) override {}; + void EnableDisableButtons() override; + void UpdatePrefs() override; private: diff --git a/src/toolbars/MeterToolBar.h b/src/toolbars/MeterToolBar.h index 679d4046f..4e8fb6e6c 100644 --- a/src/toolbars/MeterToolBar.h +++ b/src/toolbars/MeterToolBar.h @@ -36,7 +36,7 @@ class MeterToolBar final : public ToolBar { MeterToolBar(AudacityProject *project, int type); virtual ~MeterToolBar(); - void Create(wxWindow *parent); + void Create(wxWindow *parent) override; void Populate() override; void ReCreateButtons() override; @@ -47,10 +47,10 @@ class MeterToolBar final : public ToolBar { void OnSize(wxSizeEvent & event); bool Expose(bool show) override; - int GetInitialWidth() {return (mWhichMeters == + int GetInitialWidth() override {return (mWhichMeters == (kWithRecordMeter + kWithPlayMeter)) ? 338 : 460;} // Separate bars used to be smaller. - int GetMinToolbarWidth() { return 50; } - wxSize GetDockedSize(); + int GetMinToolbarWidth() override { return 50; } + wxSize GetDockedSize() override; private: void RegenerateTooltips() override; diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h index a8ba523cc..629475e2e 100644 --- a/src/toolbars/MixerToolBar.h +++ b/src/toolbars/MixerToolBar.h @@ -29,9 +29,9 @@ class MixerToolBar final : public ToolBar { MixerToolBar(); virtual ~MixerToolBar(); - void Create(wxWindow * parent); + void Create(wxWindow * parent) override; - void UpdatePrefs(); + void UpdatePrefs() override; void UpdateControls(); void SetMixer(wxCommandEvent &event); diff --git a/src/toolbars/ScrubbingToolBar.h b/src/toolbars/ScrubbingToolBar.h index 48bc0b2f1..24f94c78c 100644 --- a/src/toolbars/ScrubbingToolBar.h +++ b/src/toolbars/ScrubbingToolBar.h @@ -43,12 +43,12 @@ public: ScrubbingToolBar(); virtual ~ScrubbingToolBar(); - void Create(wxWindow *parent); + void Create(wxWindow *parent) override; void OnButton(wxCommandEvent & event); - void Populate(); - void Repaint(wxDC * WXUNUSED(dc)) {}; + void Populate() override; + void Repaint(wxDC * WXUNUSED(dc)) override {}; void EnableDisableButtons() override; void UpdatePrefs() override; diff --git a/src/toolbars/SelectionBar.h b/src/toolbars/SelectionBar.h index b2343adb9..432884b32 100644 --- a/src/toolbars/SelectionBar.h +++ b/src/toolbars/SelectionBar.h @@ -64,7 +64,7 @@ class SelectionBar final : public ToolBar { SelectionBar(); virtual ~SelectionBar(); - void Create(wxWindow *parent); + void Create(wxWindow *parent) override; void Populate() override; void Repaint(wxDC * WXUNUSED(dc)) override {}; diff --git a/src/toolbars/SpectralSelectionBar.h b/src/toolbars/SpectralSelectionBar.h index 4cb9e6946..af68ca995 100644 --- a/src/toolbars/SpectralSelectionBar.h +++ b/src/toolbars/SpectralSelectionBar.h @@ -34,7 +34,7 @@ public: SpectralSelectionBar(); virtual ~SpectralSelectionBar(); - void Create(wxWindow *parent); + void Create(wxWindow *parent) override; void Populate() override; void Repaint(wxDC * WXUNUSED(dc)) override {}; diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h index 81d3ede4c..fa7a73001 100644 --- a/src/toolbars/ToolBar.h +++ b/src/toolbars/ToolBar.h @@ -124,7 +124,7 @@ class ToolBar /* not final */ : public wxPanelWrapper void SetVisible( bool bVisible ); void SetPositioned(){ mPositioned = true;}; - /// Resizable toolbars should implement this. + /// Resizable toolbars should implement these. // NEW virtuals: virtual int GetInitialWidth() { return -1; } virtual int GetMinToolbarWidth() { return GetInitialWidth(); } diff --git a/src/toolbars/ToolsToolBar.h b/src/toolbars/ToolsToolBar.h index bcc7e9fd4..77bc116bd 100644 --- a/src/toolbars/ToolsToolBar.h +++ b/src/toolbars/ToolsToolBar.h @@ -51,7 +51,7 @@ class ToolsToolBar final : public ToolBar { ToolsToolBar(); virtual ~ToolsToolBar(); - void UpdatePrefs(); + void UpdatePrefs() override; void OnTool(wxCommandEvent & evt); @@ -62,7 +62,7 @@ class ToolsToolBar final : public ToolBar { bool IsDown(int tool) const; int GetDownTool(); - void Populate(); + void Populate() override; void Repaint(wxDC * WXUNUSED(dc)) override {}; void EnableDisableButtons() override {}; diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h index 8e13a53bb..d49a2b35f 100644 --- a/src/toolbars/TranscriptionToolBar.h +++ b/src/toolbars/TranscriptionToolBar.h @@ -72,7 +72,7 @@ class TranscriptionToolBar final : public ToolBar { TranscriptionToolBar(); virtual ~TranscriptionToolBar(); - void Create(wxWindow *parent); + void Create(wxWindow *parent) override; void OnKeyEvent(wxKeyEvent & event); void OnPlaySpeed(wxCommandEvent & event); diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index dbc2734cd..44af6345a 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -334,8 +334,8 @@ class SliderDialog final : public wxDialogWrapper float Get(); private: - bool TransferDataToWindow(); - bool TransferDataFromWindow(); + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; void OnSlider(wxCommandEvent &event);