mirror of
https://github.com/cookiengineer/audacity
synced 2025-08-02 08:59:28 +02:00
Privatize, rename ShuttleGuiBase member fns (those using WrappedType)
This commit is contained in:
parent
08a9e7246f
commit
7fbe97c5ca
@ -1125,7 +1125,7 @@ void ShuttleGuiBase::DoDataShuttle( const wxString &Name, WrappedType & WrappedR
|
||||
// they bind to (i.e. WrappedType).
|
||||
// The type specific versions are much shorter and are later
|
||||
// in this file.
|
||||
wxCheckBox * ShuttleGuiBase::TieCheckBox(const wxString &Prompt, WrappedType & WrappedRef)
|
||||
wxCheckBox * ShuttleGuiBase::DoTieCheckBox(const wxString &Prompt, WrappedType & WrappedRef)
|
||||
{
|
||||
HandleOptionality( Prompt );
|
||||
// The Add function does a UseUpId(), so don't do it here in that case.
|
||||
@ -1167,7 +1167,7 @@ wxCheckBox * ShuttleGuiBase::TieCheckBox(const wxString &Prompt, WrappedType & W
|
||||
return pCheckBox;
|
||||
}
|
||||
|
||||
wxCheckBox * ShuttleGuiBase::TieCheckBoxOnRight(const wxString &Prompt, WrappedType & WrappedRef)
|
||||
wxCheckBox * ShuttleGuiBase::DoTieCheckBoxOnRight(const wxString &Prompt, WrappedType & WrappedRef)
|
||||
{
|
||||
HandleOptionality( Prompt );
|
||||
// The Add function does a UseUpId(), so don't do it here in that case.
|
||||
@ -1209,7 +1209,7 @@ wxCheckBox * ShuttleGuiBase::TieCheckBoxOnRight(const wxString &Prompt, WrappedT
|
||||
return pCheckBox;
|
||||
}
|
||||
|
||||
wxSpinCtrl * ShuttleGuiBase::TieSpinCtrl( const wxString &Prompt, WrappedType & WrappedRef, const int max, const int min )
|
||||
wxSpinCtrl * ShuttleGuiBase::DoTieSpinCtrl( const wxString &Prompt, WrappedType & WrappedRef, const int max, const int min )
|
||||
{
|
||||
HandleOptionality( Prompt );
|
||||
// The Add function does a UseUpId(), so don't do it here in that case.
|
||||
@ -1252,7 +1252,7 @@ wxSpinCtrl * ShuttleGuiBase::TieSpinCtrl( const wxString &Prompt, WrappedType &
|
||||
return pSpinCtrl;
|
||||
}
|
||||
|
||||
wxTextCtrl * ShuttleGuiBase::TieTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars)
|
||||
wxTextCtrl * ShuttleGuiBase::DoTieTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars)
|
||||
{
|
||||
HandleOptionality( Prompt );
|
||||
// The Add function does a UseUpId(), so don't do it here in that case.
|
||||
@ -1295,7 +1295,7 @@ wxTextCtrl * ShuttleGuiBase::TieTextBox( const wxString &Prompt, WrappedType & W
|
||||
return pTextBox;
|
||||
}
|
||||
|
||||
wxTextCtrl * ShuttleGuiBase::TieNumericTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars)
|
||||
wxTextCtrl * ShuttleGuiBase::DoTieNumericTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars)
|
||||
{
|
||||
HandleOptionality( Prompt );
|
||||
// The Add function does a UseUpId(), so don't do it here in that case.
|
||||
@ -1338,7 +1338,7 @@ wxTextCtrl * ShuttleGuiBase::TieNumericTextBox( const wxString &Prompt, WrappedT
|
||||
return pTextBox;
|
||||
}
|
||||
|
||||
wxSlider * ShuttleGuiBase::TieSlider( const wxString &Prompt, WrappedType & WrappedRef, const int max, int min )
|
||||
wxSlider * ShuttleGuiBase::DoTieSlider( const wxString &Prompt, WrappedType & WrappedRef, const int max, int min )
|
||||
{
|
||||
HandleOptionality( Prompt );
|
||||
// The Add function does a UseUpId(), so don't do it here in that case.
|
||||
@ -1385,7 +1385,7 @@ wxSlider * ShuttleGuiBase::TieSlider( const wxString &Prompt, WrappedType & Wrap
|
||||
}
|
||||
|
||||
|
||||
wxChoice * ShuttleGuiBase::TieChoice(
|
||||
wxChoice * ShuttleGuiBase::DoTieChoice(
|
||||
const wxString &Prompt,
|
||||
WrappedType &WrappedRef,
|
||||
const wxArrayStringEx &choices )
|
||||
@ -1548,7 +1548,7 @@ void ShuttleGuiBase::EndRadioButtonGroup()
|
||||
wxCheckBox * ShuttleGuiBase::TieCheckBox(const wxString &Prompt, bool &Var)
|
||||
{
|
||||
WrappedType WrappedRef( Var );
|
||||
return TieCheckBox( Prompt, WrappedRef );
|
||||
return DoTieCheckBox( Prompt, WrappedRef );
|
||||
}
|
||||
|
||||
// See comment in AddCheckBoxOnRight() for why we have this variant.
|
||||
@ -1558,55 +1558,55 @@ wxCheckBox * ShuttleGuiBase::TieCheckBoxOnRight(const wxString &Prompt, bool &Va
|
||||
WrappedType WrappedRef( Var );
|
||||
if( mShuttleMode == eIsCreating )
|
||||
return AddCheckBoxOnRight( Prompt, WrappedRef.ReadAsString() == wxT("true") );
|
||||
return TieCheckBox( Prompt, WrappedRef );
|
||||
return DoTieCheckBox( Prompt, WrappedRef );
|
||||
}
|
||||
|
||||
wxSpinCtrl * ShuttleGuiBase::TieSpinCtrl( const wxString &Prompt, int &Value, const int max, const int min )
|
||||
{
|
||||
WrappedType WrappedRef(Value);
|
||||
return TieSpinCtrl( Prompt, WrappedRef, max, min );
|
||||
return DoTieSpinCtrl( Prompt, WrappedRef, max, min );
|
||||
}
|
||||
|
||||
wxTextCtrl * ShuttleGuiBase::TieTextBox( const wxString &Prompt, wxString &Selected, const int nChars)
|
||||
{
|
||||
WrappedType WrappedRef(Selected);
|
||||
return TieTextBox( Prompt, WrappedRef, nChars );
|
||||
return DoTieTextBox( Prompt, WrappedRef, nChars );
|
||||
}
|
||||
|
||||
wxTextCtrl * ShuttleGuiBase::TieTextBox( const wxString &Prompt, int &Selected, const int nChars)
|
||||
{
|
||||
WrappedType WrappedRef( Selected );
|
||||
return TieTextBox( Prompt, WrappedRef, nChars );
|
||||
return DoTieTextBox( Prompt, WrappedRef, nChars );
|
||||
}
|
||||
|
||||
wxTextCtrl * ShuttleGuiBase::TieTextBox( const wxString &Prompt, double &Value, const int nChars)
|
||||
{
|
||||
WrappedType WrappedRef( Value );
|
||||
return TieTextBox( Prompt, WrappedRef, nChars );
|
||||
return DoTieTextBox( Prompt, WrappedRef, nChars );
|
||||
}
|
||||
|
||||
wxTextCtrl * ShuttleGuiBase::TieNumericTextBox( const wxString &Prompt, int &Value, const int nChars)
|
||||
{
|
||||
WrappedType WrappedRef( Value );
|
||||
return TieNumericTextBox( Prompt, WrappedRef, nChars );
|
||||
return DoTieNumericTextBox( Prompt, WrappedRef, nChars );
|
||||
}
|
||||
|
||||
wxTextCtrl * ShuttleGuiBase::TieNumericTextBox( const wxString &Prompt, double &Value, const int nChars)
|
||||
{
|
||||
WrappedType WrappedRef( Value );
|
||||
return TieNumericTextBox( Prompt, WrappedRef, nChars );
|
||||
return DoTieNumericTextBox( Prompt, WrappedRef, nChars );
|
||||
}
|
||||
|
||||
wxSlider * ShuttleGuiBase::TieSlider( const wxString &Prompt, int &pos, const int max, const int min )
|
||||
{
|
||||
WrappedType WrappedRef( pos );
|
||||
return TieSlider( Prompt, WrappedRef, max, min );
|
||||
return DoTieSlider( Prompt, WrappedRef, max, min );
|
||||
}
|
||||
|
||||
wxSlider * ShuttleGuiBase::TieSlider( const wxString &Prompt, double &pos, const double max, const double min )
|
||||
{
|
||||
WrappedType WrappedRef( pos );
|
||||
return TieSlider( Prompt, WrappedRef, max, min );
|
||||
return DoTieSlider( Prompt, WrappedRef, max, min );
|
||||
}
|
||||
|
||||
wxSlider * ShuttleGuiBase::TieSlider( const wxString &Prompt, float &pos, const float fMin, const float fMax)
|
||||
@ -1636,7 +1636,7 @@ wxChoice * ShuttleGuiBase::TieChoice(
|
||||
const wxArrayStringEx &choices )
|
||||
{
|
||||
WrappedType WrappedRef( Selected );
|
||||
return TieChoice( Prompt, WrappedRef, choices );
|
||||
return DoTieChoice( Prompt, WrappedRef, choices );
|
||||
}
|
||||
|
||||
wxChoice * ShuttleGuiBase::TieChoice(
|
||||
@ -1645,7 +1645,7 @@ wxChoice * ShuttleGuiBase::TieChoice(
|
||||
const wxArrayStringEx &choices )
|
||||
{
|
||||
WrappedType WrappedRef( Selected );
|
||||
return TieChoice( Prompt, WrappedRef, choices );
|
||||
return DoTieChoice( Prompt, WrappedRef, choices );
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------//
|
||||
@ -1759,7 +1759,7 @@ wxCheckBox * ShuttleGuiBase::TieCheckBox(
|
||||
bool bValue=bDefault;
|
||||
WrappedType WrappedRef( bValue );
|
||||
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
if( DoStep(2) ) pCheck = TieCheckBox( Prompt, WrappedRef );
|
||||
if( DoStep(2) ) pCheck = DoTieCheckBox( Prompt, WrappedRef );
|
||||
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
|
||||
return pCheck;
|
||||
@ -1777,7 +1777,7 @@ wxCheckBox * ShuttleGuiBase::TieCheckBoxOnRight(
|
||||
bool bValue=bDefault;
|
||||
WrappedType WrappedRef( bValue );
|
||||
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
if( DoStep(2) ) pCheck = TieCheckBoxOnRight( Prompt, WrappedRef );
|
||||
if( DoStep(2) ) pCheck = DoTieCheckBoxOnRight( Prompt, WrappedRef );
|
||||
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
|
||||
return pCheck;
|
||||
@ -1797,7 +1797,7 @@ wxSlider * ShuttleGuiBase::TieSlider(
|
||||
int iValue=iDefault;
|
||||
WrappedType WrappedRef( iValue );
|
||||
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
if( DoStep(2) ) pSlider = TieSlider( Prompt, WrappedRef, max, min );
|
||||
if( DoStep(2) ) pSlider = DoTieSlider( Prompt, WrappedRef, max, min );
|
||||
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
|
||||
return pSlider;
|
||||
@ -1817,7 +1817,7 @@ wxSpinCtrl * ShuttleGuiBase::TieSpinCtrl(
|
||||
int iValue = Value;
|
||||
WrappedType WrappedRef( iValue );
|
||||
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
if( DoStep(2) ) pSpinCtrl = TieSpinCtrl( Prompt, WrappedRef, max, min );
|
||||
if( DoStep(2) ) pSpinCtrl = DoTieSpinCtrl( Prompt, WrappedRef, max, min );
|
||||
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
|
||||
return pSpinCtrl;
|
||||
@ -1836,7 +1836,7 @@ wxTextCtrl * ShuttleGuiBase::TieTextBox(
|
||||
wxString Temp = Default;
|
||||
WrappedType WrappedRef( Temp );
|
||||
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
if( DoStep(2) ) pText = TieTextBox( Prompt, WrappedRef, nChars );
|
||||
if( DoStep(2) ) pText = DoTieTextBox( Prompt, WrappedRef, nChars );
|
||||
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
return pText;
|
||||
}
|
||||
@ -1855,7 +1855,7 @@ wxTextCtrl * ShuttleGuiBase::TieNumericTextBox(
|
||||
double Temp = Default;
|
||||
WrappedType WrappedRef( Temp );
|
||||
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
if( DoStep(2) ) pText = TieNumericTextBox( Prompt, WrappedRef, nChars );
|
||||
if( DoStep(2) ) pText = DoTieNumericTextBox( Prompt, WrappedRef, nChars );
|
||||
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
|
||||
return pText;
|
||||
}
|
||||
|
@ -178,34 +178,25 @@ public:
|
||||
void StartRadioButtonGroup( const ChoiceSetting &Setting );
|
||||
void EndRadioButtonGroup();
|
||||
|
||||
void DoDataShuttle( const wxString &Name, WrappedType & WrappedRef );
|
||||
|
||||
bool DoStep( int iStep );
|
||||
int TranslateToIndex( const wxString &Value, const wxArrayStringEx &Choices );
|
||||
wxString TranslateFromIndex( const int nIn, const wxArrayStringEx &Choices );
|
||||
|
||||
//-- Tie functions both add controls and also read/write to them.
|
||||
// The ones taking a 'WrappedType' are type-generic and are used by the type specific ones.
|
||||
|
||||
wxTextCtrl * TieTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars);
|
||||
wxTextCtrl * TieTextBox( const wxString &Caption, wxString & Value, const int nChars=0);
|
||||
wxTextCtrl * TieTextBox( const wxString &Prompt, int &Selected, const int nChars=0);
|
||||
wxTextCtrl * TieTextBox( const wxString &Prompt, double &Value, const int nChars=0);
|
||||
|
||||
wxTextCtrl * TieNumericTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars);
|
||||
wxTextCtrl * TieNumericTextBox( const wxString &Prompt, int &Value, const int nChars=0);
|
||||
wxTextCtrl * TieNumericTextBox( const wxString &Prompt, double &Value, const int nChars=0);
|
||||
|
||||
wxCheckBox * TieCheckBox( const wxString &Prompt, WrappedType & WrappedRef );
|
||||
wxCheckBox * TieCheckBox( const wxString &Prompt, bool & Var );
|
||||
wxCheckBox * TieCheckBoxOnRight( const wxString & Prompt, WrappedType & WrappedRef );
|
||||
wxCheckBox * TieCheckBoxOnRight( const wxString & Prompt, bool & Var );
|
||||
|
||||
wxChoice * TieChoice( const wxString &Prompt, WrappedType & WrappedRef, const wxArrayStringEx &choices );
|
||||
wxChoice * TieChoice( const wxString &Prompt, wxString &Selected, const wxArrayStringEx &choices );
|
||||
wxChoice * TieChoice( const wxString &Prompt, int &Selected, const wxArrayStringEx &choices );
|
||||
|
||||
wxSlider * TieSlider( const wxString &Prompt, WrappedType & WrappedRef, const int max, const int min = 0 );
|
||||
wxSlider * TieSlider( const wxString &Prompt, int &pos, const int max, const int min = 0);
|
||||
wxSlider * TieSlider( const wxString &Prompt, double &pos, const double max, const double min = 0.0);
|
||||
wxSlider * TieSlider( const wxString &Prompt, float &pos, const float fMin, const float fMax);
|
||||
@ -215,7 +206,6 @@ public:
|
||||
// and as many times as there are values in the enumeration.
|
||||
wxRadioButton * TieRadioButton();
|
||||
|
||||
wxSpinCtrl * TieSpinCtrl( const wxString &Prompt, WrappedType & WrappedRef, const int max, const int min = 0 );
|
||||
wxSpinCtrl * TieSpinCtrl( const wxString &Prompt, int &Value, const int max, const int min = 0 );
|
||||
|
||||
|
||||
@ -344,6 +334,15 @@ protected:
|
||||
wxMenu * mpMenu;
|
||||
|
||||
private:
|
||||
void DoDataShuttle( const wxString &Name, WrappedType & WrappedRef );
|
||||
wxCheckBox * DoTieCheckBoxOnRight( const wxString & Prompt, WrappedType & WrappedRef );
|
||||
wxTextCtrl * DoTieTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars);
|
||||
wxTextCtrl * DoTieNumericTextBox( const wxString &Prompt, WrappedType & WrappedRef, const int nChars);
|
||||
wxCheckBox * DoTieCheckBox( const wxString &Prompt, WrappedType & WrappedRef );
|
||||
wxChoice * DoTieChoice( const wxString &Prompt, WrappedType & WrappedRef, const wxArrayStringEx & choices );
|
||||
wxSlider * DoTieSlider( const wxString &Prompt, WrappedType & WrappedRef, const int max, const int min = 0 );
|
||||
wxSpinCtrl * DoTieSpinCtrl( const wxString &Prompt, WrappedType & WrappedRef, const int max, const int min = 0 );
|
||||
|
||||
const ChoiceSetting *mpRadioSetting = nullptr;
|
||||
wxString mRadioSettingName; /// The setting controlled by a group.
|
||||
Maybe<WrappedType> mRadioValue; /// The wrapped value associated with the active radio button.
|
||||
|
Loading…
x
Reference in New Issue
Block a user