1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-25 07:43:54 +02:00

New overload of TieChoice taking EnumSetting...

... and change misleading argument names
This commit is contained in:
Paul Licameli
2018-03-20 00:48:44 -04:00
parent 7f7f739fe5
commit 872b4f430c
2 changed files with 51 additions and 17 deletions

View File

@@ -27,6 +27,9 @@
// For ShuttleGuiGetDefinitions.
#include "commands/CommandTargets.h"
class EnumSetting;
const int nMaxNestedSizers = 20;
enum teShuttleMode
@@ -209,18 +212,24 @@ public:
const wxString &Prompt,
const wxString &SettingName,
const bool bDefault);
// This one is defined in terms of the next and not virtual
virtual wxChoice *TieChoice(
const wxString &Prompt,
EnumSetting &enumSetting );
virtual wxChoice * TieChoice(
const wxString &Prompt,
const wxString &SettingName,
const wxString &Default,
const wxArrayString &Choices,
const wxArrayString & TranslatedChoices );
const wxArrayString & InternalChoices );
virtual wxChoice * TieChoice(
const wxString &Prompt,
const wxString &SettingName,
const int Default,
const wxArrayString & Choices,
const std::vector<int> & TranslatedChoices);
const std::vector<int> & InternalChoices );
virtual wxTextCtrl * TieTextBox(
const wxString &Prompt,
const wxString &SettingName,
@@ -421,13 +430,13 @@ public:
const wxString &SettingName,
const wxString &Default,
const wxArrayString &Choices,
const wxArrayString & TranslatedChoices ) override;
const wxArrayString & InternalChoices ) override;
wxChoice * TieChoice(
const wxString &Prompt,
const wxString &SettingName,
const int Default,
const wxArrayString & Choices,
const std::vector<int> & TranslatedChoices) override;
const std::vector<int> & InternalChoices) override;
wxTextCtrl * TieTextBox(
const wxString &Prompt,
const wxString &SettingName,