Follow wxWidgets argument conventions for other ctors

src/FreqWindow.cpp

@@ -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)
+FreqPlot::FreqPlot(wxWindow *parent, wxWindowID winid)
-:  wxWindow(parent, wxID_ANY)
+:  wxWindow(parent, winid)
 {
    freqWindow = (FreqWindow *) parent;
 }
@@ -1135,8 +1135,8 @@ void FreqPlot::OnMouseEvent(wxMouseEvent & event)
    freqWindow->PlotMouseEvent(event);
 }
 
-FreqGauge::FreqGauge(wxWindow * parent)
+FreqGauge::FreqGauge(wxWindow * parent, wxWindowID winid)
-:  wxStatusBar(parent, wxID_ANY, wxST_SIZEGRIP)
+:  wxStatusBar(parent, winid, wxST_SIZEGRIP)
 {
    mRange = 0;
 }

src/FreqWindow.h

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

src/effects/AutoDuck.cpp

@@ -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)
+EffectAutoDuckPanel::EffectAutoDuckPanel(
-:  wxPanelWrapper(parent, wxID_ANY, wxDefaultPosition, wxSize(600, 300))
+   wxWindow *parent, wxWindowID winid, EffectAutoDuck *effect)
+:  wxPanelWrapper(parent, winid, wxDefaultPosition, wxSize(600, 300))
 {
    mParent = parent;
    mEffect = effect;

src/effects/AutoDuck.h

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

src/effects/Compressor.cpp

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

src/effects/Compressor.h

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

src/effects/Equalization.cpp

@@ -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)
+EqualizationPanel::EqualizationPanel(
-:  wxPanelWrapper(parent)
+   wxWindow *parent, wxWindowID winid, EffectEqualization *effect)
+:  wxPanelWrapper(parent, winid)
 {
    mParent = parent;
    mEffect = effect;

src/effects/Equalization.h

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

src/effects/ScienFilter.cpp

@@ -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)
+EffectScienFilterPanel::EffectScienFilterPanel(
-:  wxPanelWrapper(parent, wxID_ANY, wxDefaultPosition, wxSize(400, 200))
+   wxWindow *parent, wxWindowID winid, EffectScienFilter *effect)
+:  wxPanelWrapper(parent, winid, wxDefaultPosition, wxSize(400, 200))
 {
    mEffect = effect;
    mParent = parent;

src/effects/ScienFilter.h

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

src/export/Export.cpp

@@ -1019,8 +1019,9 @@ BEGIN_EVENT_TABLE(ExportMixerPanel, wxPanelWrapper)
     EVT_MOUSE_EVENTS(ExportMixerPanel::OnMouseEvent)
 END_EVENT_TABLE()
 
-ExportMixerPanel::ExportMixerPanel( MixerSpec *mixerSpec,
+ExportMixerPanel::ExportMixerPanel( wxWindow *parent, wxWindowID id,
-      wxArrayString trackNames,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,
+      wxWindow *mixerPanel = safenew ExportMixerPanel(this, ID_MIXERPANEL,
-         ID_MIXERPANEL, wxDefaultPosition, wxSize(400, -1));
+         mMixerSpec.get(), mTrackNames,
+         wxDefaultPosition, wxSize(400, -1));
       mixerPanel->SetName(_("Mixer Panel"));
       vertSizer->Add(mixerPanel, 1, wxEXPAND | wxALIGN_CENTRE | wxALL, 5);
 

src/export/Export.h

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