Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-09 06:06:24 +01:00
Code Issues Releases Wiki Activity

use override

Browse Source
This commit is contained in:
Paul Licameli
2017-10-01 13:28:04 -04:00
parent 9612e3d971
commit 31231a54d2
33 changed files with 100 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/toolbars/ControlToolBar.h
View File

@@ -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;

6
src/toolbars/DeviceToolBar.h
View File

@@ -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();

10
src/toolbars/EditToolBar.h
View File

@@ -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:

8
src/toolbars/MeterToolBar.h
View File

@@ -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;

4
src/toolbars/MixerToolBar.h
View File

@@ -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);

6
src/toolbars/ScrubbingToolBar.h
View File

@@ -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;

2
src/toolbars/SelectionBar.h
View File

@@ -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 {};

2
src/toolbars/SpectralSelectionBar.h
View File

@@ -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 {};

2
src/toolbars/ToolBar.h
View File

@@ -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(); }

4
src/toolbars/ToolsToolBar.h
View File

@@ -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 {};

2
src/toolbars/TranscriptionToolBar.h
View File

@@ -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);