audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rewrite empty prompts to ShuttleGUI functions as {} ... 

... so we might more easily redefine the type of the function argument,
some other day (not this release)
This commit is contained in:
Paul Licameli 2017-09-27 21:20:14 -04:00
parent e0970ad1e8
commit 80a958f8a4
38 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BatchProcessDialog.cpp
View File

@ -161,7 +161,7 @@ void BatchProcessDialog::OnApplyToProject(wxCommandEvent & WXUNUSED(event))
S.StartHorizontalLay(wxCENTER, false);
{
S.StartStatic(wxT(""), false); // deliberately not translated (!)
S.StartStatic( {}, false); // deliberately not translated (!)
{
S.SetBorder(20);
S.AddFixedText(wxString::Format(_("Applying '%s' to current project"),

4
src/FFmpeg.cpp
View File

@ -489,10 +489,10 @@ public:
{
if (mLibPath.GetFullPath().IsEmpty()) {
text.Printf(_("To find '%s', click here -->"), mName);
mPathText = S.AddTextBox(wxT(""), text, 0);
mPathText = S.AddTextBox( {}, text, 0);
}
else {
mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0);
mPathText = S.AddTextBox( {}, mLibPath.GetFullPath(), 0);
}
S.Id(ID_FFMPEG_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT);
S.AddVariableText(_("To get a free copy of FFmpeg, click here -->"), true);

4
src/FreqWindow.cpp
View File

@ -393,12 +393,12 @@ FreqWindow::FreqWindow(wxWindow * parent, wxWindowID id,
S.AddPrompt(_("Cursor:"));
S.SetStyle(wxTE_READONLY);
mCursorText = S.AddTextBox(wxT(""), wxT(""), 10);
mCursorText = S.AddTextBox( {}, wxT(""), 10);
S.AddPrompt(_("Peak:"));
S.SetStyle(wxTE_READONLY);
mPeakText = S.AddTextBox(wxT(""), wxT(""), 10);
mPeakText = S.AddTextBox( {}, wxT(""), 10);
S.AddSpace(5);
mGridOnOff = S.Id(GridOnOffID).AddCheckBox(_("&Grids"), wxT("false"));

4
src/HistoryWindow.cpp
View File

@ -96,11 +96,11 @@ HistoryWindow::HistoryWindow(AudacityProject *parent, UndoManager *manager):
// FIXME: Textbox labels have inconsistent capitalization
mTotal = S.Id(ID_TOTAL).AddTextBox(_("&Total space used"), wxT("0"), 10);
mTotal->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(HistoryWindow::OnChar));
S.AddVariableText(wxT(""))->Hide();
S.AddVariableText( {} )->Hide();
mAvail = S.Id(ID_AVAIL).AddTextBox(_("&Undo Levels Available"), wxT("0"), 10);
mAvail->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(HistoryWindow::OnChar));
S.AddVariableText(wxT(""))->Hide();
S.AddVariableText( {} )->Hide();
S.AddPrompt(_("&Levels To Discard"));
mLevels = safenew wxSpinCtrl(this,

4
src/Tags.cpp
View File

@ -900,7 +900,7 @@ void TagsEditor::PopulateOrExchange(ShuttleGui & S)
{
S.Id(AddID).AddButton(_("&Add"));
S.Id(RemoveID).AddButton(_("&Remove"));
S.AddTitle(wxT(" "));
S.AddTitle( {} );
S.Id(ClearID).AddButton(_("Cl&ear"));
}
S.EndMultiColumn();
@ -923,7 +923,7 @@ void TagsEditor::PopulateOrExchange(ShuttleGui & S)
{
S.Id(LoadID).AddButton(_("&Load..."));
S.Id(SaveID).AddButton(_("&Save..."));
S.AddTitle(wxT(" "));
S.AddTitle( {} );
S.Id(SaveDefaultsID).AddButton(_("Set De&fault"));
}
S.EndMultiColumn();

2
src/effects/Amplify.cpp
View File

@ -228,7 +228,7 @@ void EffectAmplify::PopulateOrExchange(ShuttleGui & S)
S.StartHorizontalLay(wxEXPAND);
{
S.SetStyle(wxSL_HORIZONTAL);
mAmpS = S.Id(ID_Amp).AddSlider(wxT(""), 0, MAX_Amp * SCL_Amp, MIN_Amp * SCL_Amp);
mAmpS = S.Id(ID_Amp).AddSlider( {}, 0, MAX_Amp * SCL_Amp, MIN_Amp * SCL_Amp);
mAmpS->SetName(_("Amplification dB"));
}
S.EndHorizontalLay();

6
src/effects/BassTreble.cpp
View File

@ -225,7 +225,7 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
mBassT->SetValidator(vldBass);
S.SetStyle(wxSL_HORIZONTAL);
mBassS = S.Id(ID_Bass).AddSlider(wxT(""), 0, MAX_Bass * SCL_Bass, MIN_Bass * SCL_Bass);
mBassS = S.Id(ID_Bass).AddSlider( {}, 0, MAX_Bass * SCL_Bass, MIN_Bass * SCL_Bass);
mBassS->SetName(_("Bass"));
// Treble control
@ -235,7 +235,7 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
mTrebleT->SetValidator(vldTreble);
S.SetStyle(wxSL_HORIZONTAL);
mTrebleS = S.Id(ID_Treble).AddSlider(wxT(""), 0, MAX_Treble * SCL_Treble, MIN_Treble * SCL_Treble);
mTrebleS = S.Id(ID_Treble).AddSlider( {}, 0, MAX_Treble * SCL_Treble, MIN_Treble * SCL_Treble);
mTrebleS->SetName(_("Treble"));
}
S.EndMultiColumn();
@ -255,7 +255,7 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
mGainT->SetValidator(vldGain);
S.SetStyle(wxSL_HORIZONTAL);
mGainS = S.Id(ID_Gain).AddSlider(wxT(""), 0, MAX_Gain * SCL_Gain, MIN_Gain * SCL_Gain);
mGainS = S.Id(ID_Gain).AddSlider( {}, 0, MAX_Gain * SCL_Gain, MIN_Gain * SCL_Gain);
mGainS->SetName(_("Level"));
}
S.EndMultiColumn();

6
src/effects/ChangePitch.cpp
View File

@ -263,7 +263,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
m_pChoice_FromPitch->SetName(_("from"));
m_pChoice_FromPitch->SetSizeHints(80, -1);
m_pSpin_FromOctave = S.Id(ID_FromOctave).AddSpinCtrl(wxT(""), m_nFromOctave, INT_MAX, INT_MIN);
m_pSpin_FromOctave = S.Id(ID_FromOctave).AddSpinCtrl( {}, m_nFromOctave, INT_MAX, INT_MIN);
m_pSpin_FromOctave->SetName(_("from Octave"));
m_pSpin_FromOctave->SetSizeHints(50, -1);
@ -272,7 +272,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
m_pChoice_ToPitch->SetSizeHints(80, -1);
m_pSpin_ToOctave =
S.Id(ID_ToOctave).AddSpinCtrl(wxT(""), m_nToOctave, INT_MAX, INT_MIN);
S.Id(ID_ToOctave).AddSpinCtrl( {}, m_nToOctave, INT_MAX, INT_MIN);
m_pSpin_ToOctave->SetName(_("to Octave"));
m_pSpin_ToOctave->SetSizeHints(50, -1);
}
@ -323,7 +323,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
{
S.SetStyle(wxSL_HORIZONTAL);
m_pSlider_PercentChange = S.Id(ID_PercentChange)
.AddSlider(wxT(""), 0, (int)kSliderMax, (int)MIN_Percentage);
.AddSlider( {}, 0, (int)kSliderMax, (int)MIN_Percentage);
m_pSlider_PercentChange->SetName(_("Percent Change"));
}
S.EndHorizontalLay();

2
src/effects/ChangeSpeed.cpp
View File

@ -323,7 +323,7 @@ void EffectChangeSpeed::PopulateOrExchange(ShuttleGui & S)
{
S.SetStyle(wxSL_HORIZONTAL);
mpSlider_PercentChange =
S.Id(ID_PercentChange).AddSlider(wxT(""), 0, (int)kSliderMax, (int)MIN_Percentage);
S.Id(ID_PercentChange).AddSlider( {}, 0, (int)kSliderMax, (int)MIN_Percentage);
mpSlider_PercentChange->SetName(_("Percent Change"));
}
S.EndHorizontalLay();

2
src/effects/ChangeTempo.cpp
View File

@ -223,7 +223,7 @@ void EffectChangeTempo::PopulateOrExchange(ShuttleGui & S)
{
S.SetStyle(wxSL_HORIZONTAL);
m_pSlider_PercentChange = S.Id(ID_PercentChange)
.AddSlider(wxT(""), 0, (int)kSliderMax, (int)MIN_Percentage);
.AddSlider( {}, 0, (int)kSliderMax, (int)MIN_Percentage);
m_pSlider_PercentChange->SetName(_("Percent Change"));
}
S.EndHorizontalLay();

4
src/effects/ClickRemoval.cpp
View File

@ -342,7 +342,7 @@ void EffectClickRemoval::PopulateOrExchange(ShuttleGui & S)
mThreshT->SetValidator(vldThresh);
S.SetStyle(wxSL_HORIZONTAL);
mThreshS = S.Id(ID_Thresh).AddSlider(wxT(""), mThresholdLevel, MAX_Threshold, MIN_Threshold);
mThreshS = S.Id(ID_Thresh).AddSlider( {}, mThresholdLevel, MAX_Threshold, MIN_Threshold);
mThreshS->SetName(_("Threshold"));
mThreshS->SetValidator(wxGenericValidator(&mThresholdLevel));
mThreshS->SetMinSize(wxSize(150, -1));
@ -356,7 +356,7 @@ void EffectClickRemoval::PopulateOrExchange(ShuttleGui & S)
mWidthT->SetValidator(vldWidth);
S.SetStyle(wxSL_HORIZONTAL);
mWidthS = S.Id(ID_Width).AddSlider(wxT(""), mClickWidth, MAX_Width, MIN_Width);
mWidthS = S.Id(ID_Width).AddSlider( {}, mClickWidth, MAX_Width, MIN_Width);
mWidthS->SetName(_("Max Spike Width"));
mWidthS->SetValidator(wxGenericValidator(&mClickWidth));
mWidthS->SetMinSize(wxSize(150, -1));

12
src/effects/Compressor.cpp
View File

@ -206,7 +206,7 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
}
S.EndHorizontalLay();
S.StartStatic(wxT(""));
S.StartStatic( {} );
{
S.StartMultiColumn(3, wxEXPAND);
{
@ -214,7 +214,7 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
mThresholdLabel = S.AddVariableText(_("Threshold:"), true,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
S.SetStyle(wxSL_HORIZONTAL);
mThresholdSlider = S.Id(ID_Threshold).AddSlider(wxT(""),
mThresholdSlider = S.Id(ID_Threshold).AddSlider( {},
DEF_Threshold * SCL_Threshold,
MAX_Threshold * SCL_Threshold,
MIN_Threshold * SCL_Threshold);
@ -225,7 +225,7 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
mNoiseFloorLabel = S.AddVariableText(_("Noise Floor:"), true,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
S.SetStyle(wxSL_HORIZONTAL);
mNoiseFloorSlider = S.Id(ID_NoiseFloor).AddSlider(wxT(""),
mNoiseFloorSlider = S.Id(ID_NoiseFloor).AddSlider( {},
DEF_NoiseFloor / SCL_NoiseFloor,
MAX_NoiseFloor / SCL_NoiseFloor,
MIN_NoiseFloor / SCL_NoiseFloor);
@ -236,7 +236,7 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
mRatioLabel = S.AddVariableText(_("Ratio:"), true,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
S.SetStyle(wxSL_HORIZONTAL);
mRatioSlider = S.Id(ID_Ratio).AddSlider(wxT(""),
mRatioSlider = S.Id(ID_Ratio).AddSlider( {},
DEF_Ratio * SCL_Ratio,
MAX_Ratio * SCL_Ratio,
MIN_Ratio * SCL_Ratio);
@ -251,7 +251,7 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
mAttackLabel = S.AddVariableText(_("Attack Time:"), true,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
S.SetStyle(wxSL_HORIZONTAL);
mAttackSlider = S.Id(ID_Attack).AddSlider(wxT(""),
mAttackSlider = S.Id(ID_Attack).AddSlider( {},
DEF_AttackTime * SCL_AttackTime,
MAX_AttackTime * SCL_AttackTime,
MIN_AttackTime * SCL_AttackTime);
@ -262,7 +262,7 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
mDecayLabel = S.AddVariableText(_("Release Time:"), true,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
S.SetStyle(wxSL_HORIZONTAL);
mDecaySlider = S.Id(ID_Decay).AddSlider(wxT(""),
mDecaySlider = S.Id(ID_Decay).AddSlider( {},
DEF_ReleaseTime * SCL_ReleaseTime,
MAX_ReleaseTime * SCL_ReleaseTime,
MIN_ReleaseTime * SCL_ReleaseTime);

12
src/effects/Contrast.cpp
View File

@ -188,10 +188,10 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
{
// Headings
S.AddFixedText(wxT("")); // spacer
S.AddFixedText( {} ); // spacer
S.AddFixedText(_("Start"));
S.AddFixedText(_("End"));
S.AddFixedText(wxT("")); // spacer
S.AddFixedText( {} ); // spacer
S.AddFixedText(_("Volume "));
//Foreground
@ -231,7 +231,7 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
S.AddWindow(mForegroundEndT);
m_pButton_UseCurrentF = S.Id(ID_BUTTON_USECURRENTF).AddButton(_("&Measure selection"));
mForegroundRMSText=S.Id(ID_FOREGROUNDDB_TEXT).AddTextBox(wxT(""), wxT(""), 17);
mForegroundRMSText=S.Id(ID_FOREGROUNDDB_TEXT).AddTextBox( {}, wxT(""), 17);
mForegroundRMSText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
//Background
@ -271,7 +271,7 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
S.AddWindow(mBackgroundEndT);
m_pButton_UseCurrentB = S.Id(ID_BUTTON_USECURRENTB).AddButton(_("Mea&sure selection"));
mBackgroundRMSText = S.Id(ID_BACKGROUNDDB_TEXT).AddTextBox(wxT(""), wxT(""), 17);
mBackgroundRMSText = S.Id(ID_BACKGROUNDDB_TEXT).AddTextBox( {}, wxT(""), 17);
mBackgroundRMSText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
}
S.EndMultiColumn();
@ -284,11 +284,11 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
S.StartMultiColumn(3, wxCENTER);
{
S.AddFixedText(_("Co&ntrast Result:"));
mPassFailText = S.Id(ID_RESULTS_TEXT).AddTextBox(wxT(""), wxT(""), 50);
mPassFailText = S.Id(ID_RESULTS_TEXT).AddTextBox( {}, wxT(""), 50);
mPassFailText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
m_pButton_Reset = S.Id(ID_BUTTON_RESET).AddButton(_("R&eset"));
S.AddFixedText(_("&Difference:"));
mDiffText = S.Id(ID_RESULTSDB_TEXT).AddTextBox(wxT(""), wxT(""), 50);
mDiffText = S.Id(ID_RESULTSDB_TEXT).AddTextBox( {}, wxT(""), 50);
mDiffText->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar));
m_pButton_Export = S.Id(ID_BUTTON_EXPORT).AddButton(_("E&xport..."));
}

20
src/effects/Distortion.cpp
View File

@ -385,14 +385,14 @@ void EffectDistortion::PopulateOrExchange(ShuttleGui & S)
mThresholdTxt = S.AddVariableText(defaultLabel(0), false, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
FloatingPointValidator<double> vldThreshold(2, &mParams.mThreshold_dB);
vldThreshold.SetRange(MIN_Threshold_dB, MAX_Threshold_dB);
mThresholdT = S.Id(ID_Threshold).AddTextBox(wxT(""), wxT(""), 10);
mThresholdT = S.Id(ID_Threshold).AddTextBox( {}, wxT(""), 10);
mThresholdT->SetName(defaultLabel(0));
mThresholdT->SetValidator(vldThreshold);
S.SetStyle(wxSL_HORIZONTAL);
double maxLin = DB_TO_LINEAR(MAX_Threshold_dB) * SCL_Threshold_dB;
double minLin = DB_TO_LINEAR(MIN_Threshold_dB) * SCL_Threshold_dB;
mThresholdS = S.Id(ID_Threshold).AddSlider(wxT(""), 0, maxLin, minLin);
mThresholdS = S.Id(ID_Threshold).AddSlider( {}, 0, maxLin, minLin);
mThresholdS->SetName(defaultLabel(0));
S.AddSpace(20, 0);
@ -400,12 +400,12 @@ void EffectDistortion::PopulateOrExchange(ShuttleGui & S)
mNoiseFloorTxt = S.AddVariableText(defaultLabel(1), false, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
FloatingPointValidator<double> vldfloor(2, &mParams.mNoiseFloor);
vldfloor.SetRange(MIN_NoiseFloor, MAX_NoiseFloor);
mNoiseFloorT = S.Id(ID_NoiseFloor).AddTextBox(wxT(""), wxT(""), 10);
mNoiseFloorT = S.Id(ID_NoiseFloor).AddTextBox( {}, wxT(""), 10);
mNoiseFloorT->SetName(defaultLabel(1));
mNoiseFloorT->SetValidator(vldfloor);
S.SetStyle(wxSL_HORIZONTAL);
mNoiseFloorS = S.Id(ID_NoiseFloor).AddSlider(wxT(""), 0, MAX_NoiseFloor, MIN_NoiseFloor);
mNoiseFloorS = S.Id(ID_NoiseFloor).AddSlider( {}, 0, MAX_NoiseFloor, MIN_NoiseFloor);
mNoiseFloorS->SetName(defaultLabel(1));
S.AddSpace(20, 0);
}
@ -425,12 +425,12 @@ void EffectDistortion::PopulateOrExchange(ShuttleGui & S)
mParam1Txt = S.AddVariableText(defaultLabel(2), false, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
FloatingPointValidator<double> vldparam1(2, &mParams.mParam1);
vldparam1.SetRange(MIN_Param1, MAX_Param1);
mParam1T = S.Id(ID_Param1).AddTextBox(wxT(""), wxT(""), 10);
mParam1T = S.Id(ID_Param1).AddTextBox( {}, wxT(""), 10);
mParam1T->SetName(defaultLabel(2));
mParam1T->SetValidator(vldparam1);
S.SetStyle(wxSL_HORIZONTAL);
mParam1S = S.Id(ID_Param1).AddSlider(wxT(""), 0, MAX_Param1, MIN_Param1);
mParam1S = S.Id(ID_Param1).AddSlider( {}, 0, MAX_Param1, MIN_Param1);
mParam1S->SetName(defaultLabel(2));
S.AddSpace(20, 0);
@ -438,12 +438,12 @@ void EffectDistortion::PopulateOrExchange(ShuttleGui & S)
mParam2Txt = S.AddVariableText(defaultLabel(3), false, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
FloatingPointValidator<double> vldParam2(2, &mParams.mParam2);
vldParam2.SetRange(MIN_Param2, MAX_Param2);
mParam2T = S.Id(ID_Param2).AddTextBox(wxT(""), wxT(""), 10);
mParam2T = S.Id(ID_Param2).AddTextBox( {}, wxT(""), 10);
mParam2T->SetName(defaultLabel(3));
mParam2T->SetValidator(vldParam2);
S.SetStyle(wxSL_HORIZONTAL);
mParam2S = S.Id(ID_Param2).AddSlider(wxT(""), 0, MAX_Param2, MIN_Param2);
mParam2S = S.Id(ID_Param2).AddSlider( {}, 0, MAX_Param2, MIN_Param2);
mParam2S->SetName(defaultLabel(3));
S.AddSpace(20, 0);
@ -451,12 +451,12 @@ void EffectDistortion::PopulateOrExchange(ShuttleGui & S)
mRepeatsTxt = S.AddVariableText(defaultLabel(4), false, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
IntegerValidator<int>vldRepeats(&mParams.mRepeats);
vldRepeats.SetRange(MIN_Repeats, MAX_Repeats);
mRepeatsT = S.Id(ID_Repeats).AddTextBox(wxT(""), wxT(""), 10);
mRepeatsT = S.Id(ID_Repeats).AddTextBox( {}, wxT(""), 10);
mRepeatsT->SetName(defaultLabel(4));
mRepeatsT->SetValidator(vldRepeats);
S.SetStyle(wxSL_HORIZONTAL);
mRepeatsS = S.Id(ID_Repeats).AddSlider(wxT(""), DEF_Repeats, MAX_Repeats, MIN_Repeats);
mRepeatsS = S.Id(ID_Repeats).AddSlider( {}, DEF_Repeats, MAX_Repeats, MIN_Repeats);
mRepeatsS->SetName(defaultLabel(4));
S.AddSpace(20, 0);
}

2
src/effects/DtmfGen.cpp
View File

@ -341,7 +341,7 @@ void EffectDtmf::PopulateOrExchange(ShuttleGui & S)
S.AddFixedText(_("Tone/silence ratio:"), false);
S.SetStyle(wxSL_HORIZONTAL | wxEXPAND);
mDtmfDutyCycleS = S.Id(ID_DutyCycle).AddSlider(wxT(""),
mDtmfDutyCycleS = S.Id(ID_DutyCycle).AddSlider( {},
dtmfDutyCycle * SCL_DutyCycle,
MAX_DutyCycle * SCL_DutyCycle,
MIN_DutyCycle * SCL_DutyCycle);

2
src/effects/Effect.cpp
View File

@ -3868,7 +3868,7 @@ EffectPresetsDialog::EffectPresetsDialog(wxWindow *parent, Effect *effect)
wxArrayString empty;
S.AddPrompt(_("Type:"));
mType = S.Id(ID_Type).AddChoice(wxT(""), wxT(""), &empty);
mType = S.Id(ID_Type).AddChoice( {}, wxT(""), &empty);
mType->SetSelection(0);
S.AddPrompt(_("&Preset:"));

12
src/effects/Equalization.cpp
View File

@ -650,14 +650,14 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
{
S.AddVariableText(_("+ dB"), false, wxCENTER);
S.SetStyle(wxSL_VERTICAL | wxSL_INVERSE);
mdBMaxSlider = S.Id(ID_dBMax).AddSlider(wxT(""), 30, 60, 0);
mdBMaxSlider = S.Id(ID_dBMax).AddSlider( {}, 30, 60, 0);
#if wxUSE_ACCESSIBILITY
mdBMaxSlider->SetName(_("Max dB"));
mdBMaxSlider->SetAccessible(safenew SliderAx(mdBMaxSlider, wxString(wxT("%d ")) + _("dB")));
#endif
S.SetStyle(wxSL_VERTICAL | wxSL_INVERSE);
mdBMinSlider = S.Id(ID_dBMin).AddSlider(wxT(""), -30, -10, -120);
mdBMinSlider = S.Id(ID_dBMin).AddSlider( {}, -30, -10, -120);
S.AddVariableText(_("- dB"), false, wxCENTER);
#if wxUSE_ACCESSIBILITY
mdBMinSlider->SetName(_("Min dB"));
@ -770,7 +770,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
{
szrI = S.GetSizer();
mInterpChoice = S.Id(ID_Interp).AddChoice(wxT(""), wxT(""), &mInterpolations);
mInterpChoice = S.Id(ID_Interp).AddChoice( {}, wxT(""), &mInterpolations);
mInterpChoice->SetName(_("Interpolation type"));
mInterpChoice->SetSelection(0);
}
@ -802,7 +802,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
S.StartHorizontalLay(wxEXPAND, 1);
{
S.SetStyle(wxSL_HORIZONTAL);
mMSlider = S.Id(ID_Length).AddSlider(wxT(""), (mM - 1) / 2, 4095, 10);
mMSlider = S.Id(ID_Length).AddSlider( {}, (mM - 1) / 2, 4095, 10);
mMSlider->SetName(_("Length of Filter"));
}
S.EndHorizontalLay();
@ -844,7 +844,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
curves.Add(mCurves[ i ].Name);
}
mCurve = S.Id(ID_Curve).AddChoice(wxT(""), wxT(""), &curves);
mCurve = S.Id(ID_Curve).AddChoice( {}, wxT(""), &curves);
mCurve->SetName(_("Select Curve"));
}
S.EndHorizontalLay();
@ -3185,7 +3185,7 @@ void EditCurvesDialog::PopulateOrExchange(ShuttleGui & S)
S.EndHorizontalLay();
S.AddStandardButtons();
S.StartStatic(_("Help"));
S.AddConstTextBox(wxT(""), _("Rename 'unnamed' to save a new entry.\n'OK' saves all changes, 'Cancel' doesn't."));
S.AddConstTextBox( {}, _("Rename 'unnamed' to save a new entry.\n'OK' saves all changes, 'Cancel' doesn't."));
S.EndStatic();
PopulateList(mPosition);
Fit();

2
src/effects/NoiseReduction.cpp
View File

@ -1428,7 +1428,7 @@ struct ControlInfo {
text->SetValidator(vld);
wxSlider *const slider =
S.Id(id).AddSlider(wxT(""), 0, sliderMax);
S.Id(id).AddSlider( {}, 0, sliderMax);
slider->SetName(sliderName());
slider->SetRange(0, sliderMax);
slider->SetSizeHints(150, -1);

4
src/effects/Normalize.cpp
View File

@ -287,12 +287,12 @@ void EffectNormalize::PopulateOrExchange(ShuttleGui & S)
FloatingPointValidator<double> vldLevel(2, &mLevel, NUM_VAL_ONE_TRAILING_ZERO);
vldLevel.SetRange(MIN_Level, MAX_Level);
mLevelTextCtrl = S.AddTextBox(wxT(""), wxT(""), 10);
mLevelTextCtrl = S.AddTextBox( {}, wxT(""), 10);
mLevelTextCtrl->SetName(_("Maximum amplitude dB"));
mLevelTextCtrl->SetValidator(vldLevel);
mLeveldB = S.AddVariableText(_("dB"), false,
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
mWarning = S.AddVariableText( wxT(""), false,
mWarning = S.AddVariableText( {}, false,
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT);
}
S.EndHorizontalLay();

14
src/effects/Phaser.cpp
View File

@ -253,7 +253,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
mStagesT->SetValidator(vldStages);
S.SetStyle(wxSL_HORIZONTAL);
mStagesS = S.Id(ID_Stages).AddSlider(wxT(""), DEF_Stages * SCL_Stages, MAX_Stages * SCL_Stages, MIN_Stages * SCL_Stages);
mStagesS = S.Id(ID_Stages).AddSlider( {}, DEF_Stages * SCL_Stages, MAX_Stages * SCL_Stages, MIN_Stages * SCL_Stages);
mStagesS->SetName(_("Stages"));
mStagesS->SetLineSize(2);
mStagesS->SetMinSize(wxSize(100, -1));
@ -264,7 +264,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
mDryWetT->SetValidator(vldDryWet);
S.SetStyle(wxSL_HORIZONTAL);
mDryWetS = S.Id(ID_DryWet).AddSlider(wxT(""), DEF_DryWet * SCL_DryWet, MAX_DryWet * SCL_DryWet, MIN_DryWet * SCL_DryWet);
mDryWetS = S.Id(ID_DryWet).AddSlider( {}, DEF_DryWet * SCL_DryWet, MAX_DryWet * SCL_DryWet, MIN_DryWet * SCL_DryWet);
mDryWetS->SetName(_("Dry Wet"));
mDryWetS->SetMinSize(wxSize(100, -1));
@ -274,7 +274,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
mFreqT->SetValidator(vldFreq);
S.SetStyle(wxSL_HORIZONTAL);
mFreqS = S.Id(ID_Freq).AddSlider(wxT(""), DEF_Freq * SCL_Freq, MAX_Freq * SCL_Freq, 0.0);
mFreqS = S.Id(ID_Freq).AddSlider( {}, DEF_Freq * SCL_Freq, MAX_Freq * SCL_Freq, 0.0);
mFreqS ->SetName(_("LFO frequency in hertz"));
mFreqS ->SetMinSize(wxSize(100, -1));
@ -284,7 +284,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
mPhaseT->SetValidator(vldPhase);
S.SetStyle(wxSL_HORIZONTAL);
mPhaseS = S.Id(ID_Phase).AddSlider(wxT(""), DEF_Phase * SCL_Phase, MAX_Phase * SCL_Phase, MIN_Phase * SCL_Phase);
mPhaseS = S.Id(ID_Phase).AddSlider( {}, DEF_Phase * SCL_Phase, MAX_Phase * SCL_Phase, MIN_Phase * SCL_Phase);
mPhaseS->SetName(_("LFO start phase in degrees"));
mPhaseS->SetLineSize(10);
mPhaseS->SetMinSize(wxSize(100, -1));
@ -295,7 +295,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
mDepthT->SetValidator(vldDepth);
S.SetStyle(wxSL_HORIZONTAL);
mDepthS = S.Id(ID_Depth).AddSlider(wxT(""), DEF_Depth * SCL_Depth, MAX_Depth * SCL_Depth, MIN_Depth * SCL_Depth);
mDepthS = S.Id(ID_Depth).AddSlider( {}, DEF_Depth * SCL_Depth, MAX_Depth * SCL_Depth, MIN_Depth * SCL_Depth);
mDepthS->SetName(_("Depth in percent"));
mDepthS->SetMinSize(wxSize(100, -1));
@ -305,7 +305,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
mFeedbackT->SetValidator(vldFeedback);
S.SetStyle(wxSL_HORIZONTAL);
mFeedbackS = S.Id(ID_Feedback).AddSlider(wxT(""), DEF_Feedback * SCL_Feedback, MAX_Feedback * SCL_Feedback, MIN_Feedback * SCL_Feedback);
mFeedbackS = S.Id(ID_Feedback).AddSlider( {}, DEF_Feedback * SCL_Feedback, MAX_Feedback * SCL_Feedback, MIN_Feedback * SCL_Feedback);
mFeedbackS->SetName(_("Feedback in percent"));
mFeedbackS->SetLineSize(10);
mFeedbackS->SetMinSize(wxSize(100, -1));
@ -316,7 +316,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
mOutGainT->SetValidator(vldoutgain);
S.SetStyle(wxSL_HORIZONTAL);
mOutGainS = S.Id(ID_OutGain).AddSlider(wxT(""), DEF_OutGain * SCL_OutGain, MAX_OutGain * SCL_OutGain, MIN_OutGain * SCL_OutGain);
mOutGainS = S.Id(ID_OutGain).AddSlider( {}, DEF_OutGain * SCL_OutGain, MAX_OutGain * SCL_OutGain, MIN_OutGain * SCL_OutGain);
mOutGainS->SetName(_("Output gain (dB)"));
mOutGainS->SetMinSize(wxSize(100, -1));
}

2
src/effects/Reverb.cpp
View File

@ -425,7 +425,7 @@ void EffectReverb::PopulateOrExchange(ShuttleGui & S)
AddSpinCtrl( p, DEF_ ## n, MAX_ ## n, MIN_ ## n); \
S.SetStyle(wxSL_HORIZONTAL); \
m ## n ## S = S.Id(ID_ ## n). \
AddSlider(wxT(""), DEF_ ## n, MAX_ ## n, MIN_ ## n);
AddSlider( {}, DEF_ ## n, MAX_ ## n, MIN_ ## n);
SpinSlider(RoomSize, _("&Room Size (%):"))
SpinSlider(PreDelay, _("&Pre-delay (ms):"))

8
src/effects/ScienFilter.cpp
View File

@ -408,14 +408,14 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
{
S.AddVariableText(_("+ dB"), false, wxCENTER);
S.SetStyle(wxSL_VERTICAL | wxSL_INVERSE);
mdBMaxSlider = S.Id(ID_dBMax).AddSlider(wxT(""), 10, 20, 0);
mdBMaxSlider = S.Id(ID_dBMax).AddSlider( {}, 10, 20, 0);
#if wxUSE_ACCESSIBILITY
mdBMaxSlider->SetName(_("Max dB"));
mdBMaxSlider->SetAccessible(safenew SliderAx(mdBMaxSlider, wxString(wxT("%d ")) + _("dB")));
#endif
S.SetStyle(wxSL_VERTICAL | wxSL_INVERSE);
mdBMinSlider = S.Id(ID_dBMin).AddSlider(wxT(""), -10, -10, -120);
mdBMinSlider = S.Id(ID_dBMin).AddSlider( {}, -10, -10, -120);
S.AddVariableText(_("- dB"), false, wxCENTER);
#if wxUSE_ACCESSIBILITY
mdBMinSlider->SetName(_("Min dB"));
@ -483,7 +483,7 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
vldRipple.SetRange(MIN_Passband, MAX_Passband);
mRippleCtlP = S.AddVariableText(_("&Passband Ripple:"), false, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
mRippleCtl = S.Id(ID_Ripple).AddTextBox(wxT(""), wxT(""), 10);
mRippleCtl = S.Id(ID_Ripple).AddTextBox( {}, wxT(""), 10);
mRippleCtl->SetName(_("Passband Ripple (dB)"));
mRippleCtl->SetValidator(vldRipple);
mRippleCtlU = S.AddVariableText(_("dB"), false, wxALL | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
@ -512,7 +512,7 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
vldStopbandRipple.SetRange(MIN_Stopband, MAX_Stopband);
mStopbandRippleCtlP = S.AddVariableText(_("Minimum S&topband Attenuation:"), false, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
mStopbandRippleCtl = S.Id(ID_StopbandRipple).AddTextBox(wxT(""), wxT(""), 10);
mStopbandRippleCtl = S.Id(ID_StopbandRipple).AddTextBox( {}, wxT(""), 10);
mStopbandRippleCtl->SetName(_("Minimum S&topband Attenuation (dB)"));
mStopbandRippleCtl->SetValidator(vldStopbandRipple);
mStopbandRippleCtlU = S.AddVariableText(_("dB"), false, wxALL | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);

8
src/effects/TimeScale.cpp
View File

@ -208,7 +208,7 @@ void EffectTimeScale::PopulateOrExchange(ShuttleGui & S)
vldRatePercentChangeStart.SetRange(MIN_RatePercentStart, MAX_RatePercentStart);
m_pTextCtrl_RatePercentChangeStart = S.Id(ID_RatePercentChangeStart)
.AddTextBox(wxT(""), wxT(""), 12);
.AddTextBox( {}, wxT(""), 12);
m_pTextCtrl_RatePercentChangeStart->SetValidator(vldRatePercentChangeStart);
}
S.EndMultiColumn();
@ -216,7 +216,7 @@ void EffectTimeScale::PopulateOrExchange(ShuttleGui & S)
{
S.SetStyle(wxSL_HORIZONTAL);
m_pSlider_RatePercentChangeStart = S.Id(ID_RatePercentChangeStart)
.AddSlider(wxT(""), DEF_RatePercentStart, MAX_RatePercentStart, MIN_RatePercentStart);
.AddSlider( {}, DEF_RatePercentStart, MAX_RatePercentStart, MIN_RatePercentStart);
}
S.EndHorizontalLay();
}
@ -231,7 +231,7 @@ void EffectTimeScale::PopulateOrExchange(ShuttleGui & S)
vldRatePercentChangeEnd.SetRange(MIN_RatePercentEnd, MAX_RatePercentEnd);
m_pTextCtrl_RatePercentChangeEnd = S.Id(ID_RatePercentChangeEnd)
.AddTextBox(wxT(""), wxT(""), 12);
.AddTextBox( {}, wxT(""), 12);
m_pTextCtrl_RatePercentChangeEnd->SetValidator(vldRatePercentChangeEnd);
}
S.EndMultiColumn();
@ -239,7 +239,7 @@ void EffectTimeScale::PopulateOrExchange(ShuttleGui & S)
{
S.SetStyle(wxSL_HORIZONTAL);
m_pSlider_RatePercentChangeEnd = S.Id(ID_RatePercentChangeEnd)
.AddSlider(wxT(""), DEF_RatePercentEnd, MAX_RatePercentEnd, MIN_RatePercentEnd);
.AddSlider( {}, DEF_RatePercentEnd, MAX_RatePercentEnd, MIN_RatePercentEnd);
}
S.EndHorizontalLay();
}

10
src/effects/ToneGen.cpp
View File

@ -321,7 +321,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
if (mChirp)
{
S.AddFixedText(wxT(""));
S.AddFixedText( {} );
S.StartHorizontalLay(wxEXPAND);
{
S.StartHorizontalLay(wxLEFT, 50);
@ -345,7 +345,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
{
FloatingPointValidator<double> vldStartFreq(6, &mFrequency[0], NUM_VAL_NO_TRAILING_ZEROES);
vldStartFreq.SetRange(MIN_StartFreq, GetActiveProject()->GetRate() / 2.0);
t = S.AddTextBox(wxT(""), wxT(""), 12);
t = S.AddTextBox( {}, wxT(""), 12);
t->SetName(_("Frequency Hertz Start"));
t->SetValidator(vldStartFreq);
}
@ -355,7 +355,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
{
FloatingPointValidator<double> vldEndFreq(6, &mFrequency[1], NUM_VAL_NO_TRAILING_ZEROES);
vldEndFreq.SetRange(MIN_EndFreq, GetActiveProject()->GetRate() / 2.0);
t = S.AddTextBox(wxT(""), wxT(""), 12);
t = S.AddTextBox( {}, wxT(""), 12);
t->SetName(_("Frequency Hertz End"));
t->SetValidator(vldEndFreq);
}
@ -370,7 +370,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
{
FloatingPointValidator<double> vldStartAmp(6, &mAmplitude[0], NUM_VAL_NO_TRAILING_ZEROES);
vldStartAmp.SetRange(MIN_StartAmp, MAX_StartAmp);
t = S.AddTextBox(wxT(""), wxT(""), 12);
t = S.AddTextBox( {}, wxT(""), 12);
t->SetName(_("Amplitude Start"));
t->SetValidator(vldStartAmp);
}
@ -380,7 +380,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
{
FloatingPointValidator<double> vldEndAmp(6, &mAmplitude[1], NUM_VAL_NO_TRAILING_ZEROES);
vldEndAmp.SetRange(MIN_EndAmp, MAX_EndAmp);
t = S.AddTextBox(wxT(""), wxT(""), 12);
t = S.AddTextBox( {}, wxT(""), 12);
t->SetName(_("Amplitude End"));
t->SetValidator(vldEndAmp);
}

2
src/effects/TruncSilence.cpp
View File

@ -735,7 +735,7 @@ void EffectTruncSilence::PopulateOrExchange(ShuttleGui & S)
S.StartHorizontalLay();
{
// Action choices
mActionChoice = S.AddChoice(wxT(""), wxT(""), &actionChoices);
mActionChoice = S.AddChoice( {}, wxT(""), &actionChoices);
mActionChoice->SetValidator(wxGenericValidator(&mActionIndex));
S.SetSizeHints(-1, -1);
}

12
src/effects/Wahwah.cpp
View File

@ -237,7 +237,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
mFreqT->SetValidator(vldfreq);
S.SetStyle(wxSL_HORIZONTAL);
mFreqS = S.Id(ID_Freq).AddSlider(wxT(""), DEF_Freq * SCL_Freq, MAX_Freq * SCL_Freq, MIN_Freq * SCL_Freq);
mFreqS = S.Id(ID_Freq).AddSlider( {}, DEF_Freq * SCL_Freq, MAX_Freq * SCL_Freq, MIN_Freq * SCL_Freq);
mFreqS->SetName(_("LFO frequency in hertz"));
mFreqS->SetMinSize(wxSize(100, -1));
@ -247,7 +247,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
mPhaseT->SetValidator(vldphase);
S.SetStyle(wxSL_HORIZONTAL);
mPhaseS = S.Id(ID_Phase).AddSlider(wxT(""), DEF_Phase * SCL_Phase, MAX_Phase * SCL_Phase, MIN_Phase * SCL_Phase);
mPhaseS = S.Id(ID_Phase).AddSlider( {}, DEF_Phase * SCL_Phase, MAX_Phase * SCL_Phase, MIN_Phase * SCL_Phase);
mPhaseS->SetName(_("LFO start phase in degrees"));
mPhaseS->SetLineSize(10);
mPhaseS->SetMinSize(wxSize(100, -1));
@ -258,7 +258,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
mDepthT->SetValidator(vlddepth);
S.SetStyle(wxSL_HORIZONTAL);
mDepthS = S.Id(ID_Depth).AddSlider(wxT(""), DEF_Depth * SCL_Depth, MAX_Depth * SCL_Depth, MIN_Depth * SCL_Depth);
mDepthS = S.Id(ID_Depth).AddSlider( {}, DEF_Depth * SCL_Depth, MAX_Depth * SCL_Depth, MIN_Depth * SCL_Depth);
mDepthS->SetName(_("Depth in percent"));
mDepthS->SetMinSize(wxSize(100, -1));
@ -268,7 +268,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
mResT->SetValidator(vldres);
S.SetStyle(wxSL_HORIZONTAL);
mResS = S.Id(ID_Res).AddSlider(wxT(""), DEF_Res * SCL_Res, MAX_Res * SCL_Res, MIN_Res * SCL_Res);
mResS = S.Id(ID_Res).AddSlider( {}, DEF_Res * SCL_Res, MAX_Res * SCL_Res, MIN_Res * SCL_Res);
mResS->SetName(_("Resonance"));
mResS->SetMinSize(wxSize(100, -1));
@ -278,7 +278,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
mFreqOfsT->SetValidator(vldfreqoffset);
S.SetStyle(wxSL_HORIZONTAL);
mFreqOfsS = S.Id(ID_FreqOfs).AddSlider(wxT(""), DEF_FreqOfs * SCL_FreqOfs, MAX_FreqOfs * SCL_FreqOfs, MIN_FreqOfs * SCL_FreqOfs);
mFreqOfsS = S.Id(ID_FreqOfs).AddSlider( {}, DEF_FreqOfs * SCL_FreqOfs, MAX_FreqOfs * SCL_FreqOfs, MIN_FreqOfs * SCL_FreqOfs);
mFreqOfsT->SetName(_("Wah frequency offset in percent"));
mFreqOfsT->SetMinSize(wxSize(100, -1));
@ -288,7 +288,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
mOutGainT->SetValidator(vldoutgain);
S.SetStyle(wxSL_HORIZONTAL);
mOutGainS = S.Id(ID_OutGain).AddSlider(wxT(""), DEF_OutGain * SCL_OutGain, MAX_OutGain * SCL_OutGain, MIN_OutGain * SCL_OutGain);
mOutGainS = S.Id(ID_OutGain).AddSlider( {}, DEF_OutGain * SCL_OutGain, MAX_OutGain * SCL_OutGain, MIN_OutGain * SCL_OutGain);
mOutGainS->SetName(_("Output gain (dB)"));
mOutGainS->SetMinSize(wxSize(100, -1));
}

8
src/effects/nyquist/Nyquist.cpp
View File

@ -2215,7 +2215,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
{
S.AddSpace(10, 10);
wxTextCtrl *item = S.Id(ID_Text + i).AddTextBox(wxT(""), wxT(""), 12);
wxTextCtrl *item = S.Id(ID_Text + i).AddTextBox( {}, wxT(""), 12);
item->SetValidator(wxGenericValidator(&ctrl.valStr));
}
else if (ctrl.type == NYQ_CTRL_CHOICE)
@ -2223,7 +2223,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
S.AddSpace(10, 10);
wxArrayString choices = wxStringTokenize(ctrl.label, wxT(","));
S.Id(ID_Choice + i).AddChoice(wxT(""), wxT(""), &choices);
S.Id(ID_Choice + i).AddChoice( {}, wxT(""), &choices);
}
else
{
@ -2233,7 +2233,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
S.AddSpace(10, 10);
}
wxTextCtrl *item = S.Id(ID_Text+i).AddTextBox(wxT(""), wxT(""),
wxTextCtrl *item = S.Id(ID_Text+i).AddTextBox( {}, wxT(""),
(ctrl.type == NYQ_CTRL_INT_TEXT ||
ctrl.type == NYQ_CTRL_FLOAT_TEXT) ? 25 : 12);
@ -2263,7 +2263,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
if (ctrl.type == NYQ_CTRL_INT || ctrl.type == NYQ_CTRL_REAL)
{
S.SetStyle(wxSL_HORIZONTAL);
S.Id(ID_Slider + i).AddSlider(wxT(""), 0, ctrl.ticks, 0);
S.Id(ID_Slider + i).AddSlider( {}, 0, ctrl.ticks, 0);
S.SetSizeHints(150, -1);
}
}

10
src/effects/vamp/VampEffect.cpp
View File

@ -581,7 +581,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
S.AddPrompt(_("Program"));
S.Id(ID_Program);
mProgram = S.AddChoice(wxT(""), currentProgram, &choices);
mProgram = S.AddChoice( {}, currentProgram, &choices);
mProgram->SetName(_("Program"));
mProgram->SetSizeHints(-1, -1);
wxSizer *s = mProgram->GetContainingSizer();
@ -618,7 +618,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
mParameters[p].maxValue == 1.0)
{
S.Id(ID_Toggles + p);
mToggles[p] = S.AddCheckBox(wxT(""),
mToggles[p] = S.AddCheckBox( {},
value > 0.5 ? wxT("true") : wxT("false"));
mToggles[p]->SetName(labelText);
if (!tip.IsEmpty())
@ -651,7 +651,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
}
S.Id(ID_Choices + p);
mChoices[p] = S.AddChoice(wxT(""), selected, &choices);
mChoices[p] = S.AddChoice( {}, selected, &choices);
mChoices[p]->SetName(labelText);
mChoices[p]->SetSizeHints(-1, -1);
if (!tip.IsEmpty())
@ -678,7 +678,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
vld.SetStyle(style);
S.Id(ID_Texts + p);
mFields[p] = S.AddTextBox(wxT(""), wxT(""), 12);
mFields[p] = S.AddTextBox( {}, wxT(""), 12);
mFields[p]->SetName(labelText);
mFields[p]->SetValidator(vld);
if (!tip.IsEmpty())
@ -693,7 +693,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
S.SetStyle(wxSL_HORIZONTAL);
S.Id(ID_Sliders + p);
mSliders[p] = S.AddSlider(wxT(""), 0, 1000, 0);
mSliders[p] = S.AddSlider( {}, 0, 1000, 0);
mSliders[p]->SetName(labelText);
mSliders[p]->SetSizeHints(150, -1);
if (!tip.IsEmpty())

2
src/export/ExportCL.cpp
View File

@ -120,7 +120,7 @@ void ExportCLOptions::PopulateOrExchange(ShuttleGui & S)
&cmds);
S.Id(ID_BROWSE).AddButton(_("Browse..."),
wxALIGN_CENTER_VERTICAL);
S.AddFixedText(wxT(""));
S.AddFixedText( {} );
S.TieCheckBox(_("Show output"),
wxT("/FileFormats/ExternalProgramShowOutput"),
false);

10
src/export/ExportFFmpegDialogs.cpp
View File

@ -1459,9 +1459,9 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
S.SetStretchyCol(1);
S.SetStretchyCol(3);
S.Id(FEFormatLabelID).AddFixedText(_("Format:"));
mFormatName = S.Id(FEFormatNameID).AddVariableText(wxT(""));
mFormatName = S.Id(FEFormatNameID).AddVariableText( {} );
S.Id(FECodecLabelID).AddFixedText(_("Codec:"));
mCodecName = S.Id(FECodecNameID).AddVariableText(wxT(""));
mCodecName = S.Id(FECodecNameID).AddVariableText( {} );
}
S.EndMultiColumn();
S.AddVariableText(_("Not all formats and codecs are compatible. Nor are all option combinations compatible with all codecs."), false);
@ -1491,11 +1491,11 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
S.AddSpace( 20,0 );
S.AddVariableText(_("Bit Reservoir"));
S.Id(FEBitReservoirID).TieCheckBox(wxEmptyString, wxT("/FileFormats/FFmpegBitReservoir"), true);
S.Id(FEBitReservoirID).TieCheckBox( {}, wxT("/FileFormats/FFmpegBitReservoir"), true);
S.AddSpace( 20,0 );
S.AddVariableText(_("VBL"));
S.Id(FEVariableBlockLenID).TieCheckBox(wxEmptyString, wxT("/FileFormats/FFmpegVariableBlockLen"), true);
S.Id(FEVariableBlockLenID).TieCheckBox( {}, wxT("/FileFormats/FFmpegVariableBlockLen"), true);
}
S.EndMultiColumn();
S.StartMultiColumn(4, wxALIGN_LEFT);
@ -1555,7 +1555,7 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
mMaxPartitionOrderSpin->SetToolTip(_("Maximal partition order\nOptional\n-1 - default\nmin - 0\nmax - 8"));
S.AddVariableText(_("Use LPC"));
S.Id(FEUseLPCID).TieCheckBox(wxEmptyString, wxT("/FileFormats/FFmpegUseLPC"), true);
S.Id(FEUseLPCID).TieCheckBox( {}, wxT("/FileFormats/FFmpegUseLPC"), true);
}
S.EndMultiColumn();
}

4
src/export/ExportMP3.cpp
View File

@ -628,10 +628,10 @@ public:
if (mLibPath.GetFullPath().IsEmpty()) {
/* i18n-hint: There is a button to the right of the arrow.*/
text.Printf(_("To find %s, click here -->"), mName);
mPathText = S.AddTextBox(wxT(""), text, 0);
mPathText = S.AddTextBox( {}, text, 0);
}
else {
mPathText = S.AddTextBox(wxT(""), mLibPath.GetFullPath(), 0);
mPathText = S.AddTextBox( {}, mLibPath.GetFullPath(), 0);
}
S.Id(ID_BROWSE).AddButton(_("Browse..."), wxALIGN_RIGHT);
/* i18n-hint: There is a button to the right of the arrow.*/

14
src/export/ExportMultiple.cpp
View File

@ -273,8 +273,8 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
formats[mFilterIndex],
formats,
formats);
S.AddVariableText(wxT(""), false);
S.AddVariableText(wxT(""), false);
S.AddVariableText( {}, false);
S.AddVariableText( {}, false);
S.AddPrompt(_("Options:"));
if (!mBook)
@ -290,8 +290,8 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
mBook->ChangeSelection(mFormat->GetSelection());
}
S.AddWindow(mBook);
S.AddVariableText(wxT(""), false);
S.AddVariableText(wxT(""), false);
S.AddVariableText( {}, false);
S.AddVariableText( {}, false);
}
S.EndMultiColumn();
}
@ -325,13 +325,13 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
.AddCheckBox(_("Include audio before first label"), wxT("false"));
// Row 4
S.AddVariableText(wxT(""), false);
S.AddVariableText( {}, false);
S.StartMultiColumn(2, wxEXPAND);
S.SetStretchyCol(1);
{
mFirstFileLabel = S.AddVariableText(_("First file name:"), false);
mFirstFileName = S.Id(FirstFileNameID)
.Prop(1).TieTextBox(wxT(""),
.Prop(1).TieTextBox( {},
name,
30);
mFirstFileName->SetName(_("First file name"));
@ -368,7 +368,7 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
S.AddVariableText(wxT(" "), false);
mPrefixLabel = S.AddVariableText(_("File name prefix:"), false);
mPrefix = S.Id(PrefixID)
.TieTextBox(wxT(""),
.TieTextBox( {},
name,
30);
mPrefix->SetName(_("File name prefix"));

2
src/prefs/DirectoriesPrefs.cpp
View File

@ -95,7 +95,7 @@ void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S)
S.AddButton(_("C&hoose..."));
S.AddFixedText(_("Free Space:"));
mFreeSpace = S.AddVariableText(wxT(""));
mFreeSpace = S.AddVariableText( {} );
}
S.EndMultiColumn();
}

2
src/prefs/KeyConfigPrefs.cpp
View File

@ -123,7 +123,7 @@ void KeyConfigPrefs::Populate()
if (!project) {
S.StartVerticalLay(true);
{
S.StartStatic(wxEmptyString, true);
S.StartStatic( {}, true);
{
S.AddTitle(_("Keyboard preferences currently unavailable."));
S.AddTitle(_("Open a new project to modify keyboard shortcuts."));

2
src/prefs/ModulePrefs.cpp
View File

@ -102,7 +102,7 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
StatusChoices.Add( _("New" ) );
S.SetBorder(2);
S.StartStatic(wxT(""));
S.StartStatic( {} );
{
S.AddFixedText(_("These are experimental modules. Enable them only if you've read the Audacity Manual\nand know what you are doing.") );
S.AddFixedText(wxString(wxT(" ")) + _("'Ask' means Audacity will ask if you want to load the module each time it starts.") );

4
src/prefs/QualityPrefs.cpp
View File

@ -133,7 +133,7 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
// We make sure it uses the ID we want, so that we get changes
S.Id(ID_SAMPLE_RATE_CHOICE);
// We make sure we have a pointer to it, so that we can drive it.
mSampleRates = S.TieChoice(wxT(""),
mSampleRates = S.TieChoice( {},
wxT("/SamplingRate/DefaultProjectSampleRate"),
AudioIO::GetOptimalSupportedSampleRate(),
mSampleRateNames,
@ -141,7 +141,7 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
S.SetSizeHints(mSampleRateNames);
// Now do the edit box...
mOtherSampleRate = S.TieNumericTextBox(wxT(""),
mOtherSampleRate = S.TieNumericTextBox( {},
mOtherSampleRateValue,
15);
}

4
src/prefs/RecordingPrefs.cpp
View File

@ -130,7 +130,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
wxT("/GUI/TrackNames/RecordingNameCustom"),
mUseCustomTrackName ? true : false);
mToggleCustomName = S.TieTextBox(wxT(""),
mToggleCustomName = S.TieTextBox( {},
wxT("/GUI/TrackNames/RecodingTrackName"),
_("Recorded_Audio"),
30);
@ -139,7 +139,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
}
S.EndMultiColumn();
S.AddFixedText( "" );
S.AddFixedText( {} );
S.StartMultiColumn(3);
{
S.TieCheckBox(_("&Track Number"),

2
src/widgets/ASlider.cpp
View File

@ -201,7 +201,7 @@ SliderDialog::SliderDialog(wxWindow * parent, wxWindowID id,
S.StartVerticalLay();
{
mTextCtrl = S.AddTextBox(wxEmptyString,
mTextCtrl = S.AddTextBox( {},
wxEmptyString,
15);
mTextCtrl->SetValidator(wxTextValidator(wxFILTER_NUMERIC));