Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-19 17:40:51 +02:00
Code Issues Releases Wiki Activity

An overload of AddChoice specifying selected as string value

Browse Source
This commit is contained in:
Paul Licameli 2019-11-19 13:07:42 -05:00
parent 089b46ab64
commit 17ee2478bc
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ShuttleGui.cpp
View File

@ -418,6 +418,12 @@ wxChoice * ShuttleGuiBase::AddChoice( const wxString &Prompt,
return pChoice; return pChoice;
} }
wxChoice * ShuttleGuiBase::AddChoice( const wxString &Prompt,
const wxArrayStringEx &choices, const wxString &Selected )
{
return AddChoice( Prompt, choices, choices.Index( Selected ) );
}
void ShuttleGuiBase::AddFixedText(const wxString &Str, bool bCenter) void ShuttleGuiBase::AddFixedText(const wxString &Str, bool bCenter)
{ {
UseUpId(); UseUpId();

5
src/ShuttleGui.h
View File

@ -169,7 +169,10 @@ public:
wxCheckBox * AddCheckBox( const wxString &Prompt, bool Selected); wxCheckBox * AddCheckBox( const wxString &Prompt, bool Selected);
wxCheckBox * AddCheckBoxOnRight( const wxString &Prompt, bool Selected); wxCheckBox * AddCheckBoxOnRight( const wxString &Prompt, bool Selected);
wxComboBox * AddCombo( const wxString &Prompt, const wxString &Selected,const wxArrayStringEx & choices, long style = 0 ); wxComboBox * AddCombo( const wxString &Prompt, const wxString &Selected,const wxArrayStringEx & choices, long style = 0 );
wxChoice * AddChoice( const wxString &Prompt, const wxArrayStringEx &choices, int Selected = -1 ); wxChoice * AddChoice( const wxString &Prompt,
const wxArrayStringEx &choices, int Selected = -1 );
wxChoice * AddChoice( const wxString &Prompt,
const wxArrayStringEx &choices, const wxString &selected );
wxMenuBar * AddMenuBar( ); wxMenuBar * AddMenuBar( );
wxMenu * AddMenu( const wxString & Title ); wxMenu * AddMenu( const wxString & Title );
void AddIcon( wxBitmap * pBmp); void AddIcon( wxBitmap * pBmp);

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

@ -572,7 +572,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
mProgram = S.AddChoice( mProgram = S.AddChoice(
{}, {},
choices, choices,
choices.Index( currentProgram ) currentProgram
); );
mProgram->SetName(_("Program")); mProgram->SetName(_("Program"));
mProgram->SetSizeHints(-1, -1); mProgram->SetSizeHints(-1, -1);