Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 16:19:43 +02:00
Code Issues Releases Wiki Activity

Follow wxWidgets argument conventions for other ctors

Browse Source
This commit is contained in:
Paul Licameli 2017-10-20 12:06:29 -04:00
parent ab5ff9060b
commit 151cbb1305
12 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/FreqWindow.cpp
View File

@ -298,7 +298,7 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
}
S.EndVerticalLay();
mFreqPlot = safenew FreqPlot(this);
mFreqPlot = safenew FreqPlot(this, wxID_ANY);
mFreqPlot->SetMinSize(wxSize(wxDefaultCoord, FREQ_WINDOW_HEIGHT));
S.Prop(1);
S.AddWindow(mFreqPlot, wxEXPAND);
@ -481,7 +481,7 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
S.AddSpace(5);
mProgress = safenew FreqGauge(this); //, wxID_ANY, wxST_SIZEGRIP);
mProgress = safenew FreqGauge(this, wxID_ANY); //, wxST_SIZEGRIP);
S.AddWindow(mProgress, wxEXPAND);
// Log-frequency axis works for spectrum plots only.
@ -1109,8 +1109,8 @@ BEGIN_EVENT_TABLE(FreqPlot, wxWindow)
EVT_MOUSE_EVENTS(FreqPlot::OnMouseEvent)
END_EVENT_TABLE()
FreqPlot::FreqPlot(wxWindow *parent)
: wxWindow(parent, wxID_ANY)
FreqPlot::FreqPlot(wxWindow *parent, wxWindowID winid)
: wxWindow(parent, winid)
{
freqWindow = (FreqWindow *) parent;
}
@ -1135,8 +1135,8 @@ void FreqPlot::OnMouseEvent(wxMouseEvent & event)
freqWindow->PlotMouseEvent(event);
}
FreqGauge::FreqGauge(wxWindow * parent)
: wxStatusBar(parent, wxID_ANY, wxST_SIZEGRIP)
FreqGauge::FreqGauge(wxWindow * parent, wxWindowID winid)
: wxStatusBar(parent, winid, wxST_SIZEGRIP)
{
mRange = 0;
}

4
src/FreqWindow.h
View File

@ -86,7 +86,7 @@ private:
class FreqGauge final : public wxStatusBar
{
public:
FreqGauge(wxWindow * parent);
FreqGauge(wxWindow * parent, wxWindowID winid);
void SetRange(int range, int bar = 12, int gap = 3);
void SetValue(int value);
@ -106,7 +106,7 @@ private:
class FreqPlot final : public wxWindow
{
public:
FreqPlot(wxWindow *parent);
FreqPlot(wxWindow *parent, wxWindowID winid);
// We don't need or want to accept focus.
bool AcceptsFocus() const;

7
src/effects/AutoDuck.cpp
View File

@ -428,7 +428,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
{
S.AddSpace(0, 5);
mPanel = safenew EffectAutoDuckPanel(S.GetParent(), this);
mPanel = safenew EffectAutoDuckPanel(S.GetParent(), wxID_ANY, this);
S.AddWindow(mPanel);
S.AddSpace(0, 5);
@ -618,8 +618,9 @@ BEGIN_EVENT_TABLE(EffectAutoDuckPanel, wxPanelWrapper)
EVT_MOTION(EffectAutoDuckPanel::OnMotion)
END_EVENT_TABLE()
EffectAutoDuckPanel::EffectAutoDuckPanel(wxWindow *parent, EffectAutoDuck *effect)
: wxPanelWrapper(parent, wxID_ANY, wxDefaultPosition, wxSize(600, 300))
EffectAutoDuckPanel::EffectAutoDuckPanel(
wxWindow *parent, wxWindowID winid, EffectAutoDuck *effect)
: wxPanelWrapper(parent, winid, wxDefaultPosition, wxSize(600, 300))
{
mParent = parent;
mEffect = effect;

3
src/effects/AutoDuck.h
View File

@ -94,7 +94,8 @@ private:
class EffectAutoDuckPanel final : public wxPanelWrapper
{
public:
EffectAutoDuckPanel(wxWindow *parent, EffectAutoDuck *effect);
EffectAutoDuckPanel(
wxWindow *parent, wxWindowID winid, EffectAutoDuck *effect);
virtual ~EffectAutoDuckPanel();
private:

6
src/effects/Compressor.cpp
View File

@ -196,7 +196,7 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
S.StartHorizontalLay(wxEXPAND, true);
{
S.SetBorder(10);
mPanel = safenew EffectCompressorPanel(S.GetParent(),
mPanel = safenew EffectCompressorPanel(S.GetParent(), wxID_ANY,
mThresholdDB,
mNoiseFloorDB,
mRatio);
@ -644,11 +644,11 @@ BEGIN_EVENT_TABLE(EffectCompressorPanel, wxPanelWrapper)
EVT_SIZE(EffectCompressorPanel::OnSize)
END_EVENT_TABLE()
EffectCompressorPanel::EffectCompressorPanel(wxWindow *parent,
EffectCompressorPanel::EffectCompressorPanel(wxWindow *parent, wxWindowID winid,
double & threshold,
double & noiseFloor,
double & ratio)
: wxPanelWrapper(parent),
: wxPanelWrapper(parent, winid),
threshold(threshold),
noiseFloor(noiseFloor),
ratio(ratio)

2
src/effects/Compressor.h
View File

@ -138,7 +138,7 @@ private:
class EffectCompressorPanel final : public wxPanelWrapper
{
public:
EffectCompressorPanel(wxWindow *parent,
EffectCompressorPanel(wxWindow *parent, wxWindowID winid,
double & threshold,
double & noiseFloor,
double & ratio);

7
src/effects/Equalization.cpp
View File

@ -642,7 +642,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
}
S.EndVerticalLay();
mPanel = safenew EqualizationPanel(this, parent);
mPanel = safenew EqualizationPanel(parent, wxID_ANY, this);
S.Prop(1);
S.AddWindow(mPanel, wxEXPAND | wxALIGN_LEFT | wxALIGN_TOP);
S.SetSizeHints(wxDefaultCoord, wxDefaultCoord);
@ -2844,8 +2844,9 @@ BEGIN_EVENT_TABLE(EqualizationPanel, wxPanelWrapper)
EVT_SIZE(EqualizationPanel::OnSize)
END_EVENT_TABLE()
EqualizationPanel::EqualizationPanel(EffectEqualization *effect, wxWindow *parent)
: wxPanelWrapper(parent)
EqualizationPanel::EqualizationPanel(
wxWindow *parent, wxWindowID winid, EffectEqualization *effect)
: wxPanelWrapper(parent, winid)
{
mParent = parent;
mEffect = effect;

3
src/effects/Equalization.h
View File

@ -287,7 +287,8 @@ private:
class EqualizationPanel final : public wxPanelWrapper
{
public:
EqualizationPanel(EffectEqualization *effect, wxWindow *parent);
EqualizationPanel(
wxWindow *parent, wxWindowID winid, EffectEqualization *effect);
~EqualizationPanel();
// We don't need or want to accept focus.

7
src/effects/ScienFilter.cpp
View File

@ -395,7 +395,7 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
}
S.EndVerticalLay();
mPanel = safenew EffectScienFilterPanel(this, parent);
mPanel = safenew EffectScienFilterPanel(parent, wxID_ANY, this);
mPanel->SetFreqRange(mLoFreq, mNyquist);
S.SetBorder(5);
@ -1010,8 +1010,9 @@ BEGIN_EVENT_TABLE(EffectScienFilterPanel, wxPanelWrapper)
EVT_SIZE(EffectScienFilterPanel::OnSize)
END_EVENT_TABLE()
EffectScienFilterPanel::EffectScienFilterPanel(EffectScienFilter *effect, wxWindow *parent)
: wxPanelWrapper(parent, wxID_ANY, wxDefaultPosition, wxSize(400, 200))
EffectScienFilterPanel::EffectScienFilterPanel(
wxWindow *parent, wxWindowID winid, EffectScienFilter *effect)
: wxPanelWrapper(parent, winid, wxDefaultPosition, wxSize(400, 200))
{
mEffect = effect;
mParent = parent;

3
src/effects/ScienFilter.h
View File

@ -139,7 +139,8 @@ private:
class EffectScienFilterPanel final : public wxPanelWrapper
{
public:
EffectScienFilterPanel(EffectScienFilter *effect, wxWindow *parent);
EffectScienFilterPanel(
wxWindow *parent, wxWindowID winid, EffectScienFilter *effect);
virtual ~EffectScienFilterPanel();
// We don't need or want to accept focus.

10
src/export/Export.cpp
View File

@ -1019,8 +1019,9 @@ BEGIN_EVENT_TABLE(ExportMixerPanel, wxPanelWrapper)
EVT_MOUSE_EVENTS(ExportMixerPanel::OnMouseEvent)
END_EVENT_TABLE()
ExportMixerPanel::ExportMixerPanel( MixerSpec *mixerSpec,
wxArrayString trackNames,wxWindow *parent, wxWindowID id,
ExportMixerPanel::ExportMixerPanel( wxWindow *parent, wxWindowID id,
MixerSpec *mixerSpec,
wxArrayString trackNames,
const wxPoint& pos, const wxSize& size):
wxPanelWrapper(parent, id, pos, size)
, mMixerSpec{mixerSpec}
@ -1311,8 +1312,9 @@ ExportMixerDialog::ExportMixerDialog( const TrackList *tracks, bool selectedOnly
auto uVertSizer = std::make_unique<wxBoxSizer>(wxVERTICAL);
vertSizer = uVertSizer.get();
wxWindow *mixerPanel = safenew ExportMixerPanel(mMixerSpec.get(), mTrackNames, this,
ID_MIXERPANEL, wxDefaultPosition, wxSize(400, -1));
wxWindow *mixerPanel = safenew ExportMixerPanel(this, ID_MIXERPANEL,
mMixerSpec.get(), mTrackNames,
wxDefaultPosition, wxSize(400, -1));
mixerPanel->SetName(_("Mixer Panel"));
vertSizer->Add(mixerPanel, 1, wxEXPAND | wxALIGN_CENTRE | wxALL, 5);

5
src/export/Export.h
View File

@ -233,8 +233,9 @@ private:
class ExportMixerPanel final : public wxPanelWrapper
{
public:
ExportMixerPanel( MixerSpec *mixerSpec, wxArrayString trackNames,
wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition,
ExportMixerPanel( wxWindow *parent, wxWindowID id,
MixerSpec *mixerSpec, wxArrayString trackNames,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize);
virtual ~ExportMixerPanel();