Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Remove an overload of TieChoice; use more ChoiceSetting instead...

Browse Source 
... this also corrects some mis-specifications of the default choice, formerly
by string instead of array position
This commit is contained in:
Paul Licameli
2019-02-26 05:56:27 -05:00
parent 087ac5e6c9
commit 9b41741074
12 changed files with 189 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/commands/GetInfoCommand.cpp
View File

@@ -206,12 +206,6 @@ public:
const wxString &Prompt,
const wxString &SettingName,
const bool bDefault) override;
wxChoice * TieChoice(
const wxString &Prompt,
const wxString &SettingName,
const wxString &Default,
const wxArrayStringEx &Choices,
const wxArrayStringEx & InternalChoices ) override;
wxChoice * TieNumberAsChoice(
const wxString &Prompt,
@@ -281,27 +275,6 @@ wxCheckBox * ShuttleGuiGetDefinition::TieCheckBoxOnRight(
EndStruct();
return ShuttleGui::TieCheckBoxOnRight( Prompt, SettingName, bDefault );
}
wxChoice * ShuttleGuiGetDefinition::TieChoice(
const wxString &Prompt,
const wxString &SettingName,
const wxString &Default,
const wxArrayStringEx &Choices,
const wxArrayStringEx & InternalChoices )
{
StartStruct();
AddItem( SettingName, "id" );
AddItem( Prompt, "prompt" );
AddItem( "enum", "type" );
AddItem( Default, "default" );
StartField( "enum" );
StartArray();
for( size_t i=0;i<Choices.size(); i++ )
AddItem( InternalChoices[i] );
EndArray();
EndField();
EndStruct();
return ShuttleGui::TieChoice( Prompt, SettingName, Default, Choices, InternalChoices );
}
wxChoice * ShuttleGuiGetDefinition::TieNumberAsChoice(
const wxString &Prompt,
const wxString &SettingName,