Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 16:37:12 +01:00
Code Issues Releases Wiki Activity

ShuttleGui::AddChoice and TieChoice take TranslatableStrings

Browse Source
This commit is contained in:
Paul Licameli
2019-12-17 22:52:42 -05:00
parent 66097c34dc
commit 75996a851c
42 changed files with 174 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ShuttleGui.h
View File

@@ -329,9 +329,9 @@ public:
wxCheckBox * AddCheckBoxOnRight( const wxString &Prompt, bool Selected);
wxComboBox * AddCombo( const wxString &Prompt, const wxString &Selected,const wxArrayStringEx & choices );
wxChoice * AddChoice( const wxString &Prompt,
const wxArrayStringEx &choices, int Selected = -1 );
const TranslatableStrings &choices, int Selected = -1 );
wxChoice * AddChoice( const wxString &Prompt,
const wxArrayStringEx &choices, const wxString &selected );
const TranslatableStrings &choices, const TranslatableString &selected );
wxMenuBar * AddMenuBar( );
wxMenu * AddMenu( const wxString & Title );
void AddIcon( wxBitmap * pBmp);
@@ -398,8 +398,10 @@ public:
wxCheckBox * TieCheckBox( const wxString &Prompt, bool & Var );
wxCheckBox * TieCheckBoxOnRight( const wxString & Prompt, bool & Var );
wxChoice * TieChoice( const wxString &Prompt, wxString &Selected, const wxArrayStringEx &choices );
wxChoice * TieChoice( const wxString &Prompt, int &Selected, const wxArrayStringEx &choices );
wxChoice * TieChoice(
const wxString &Prompt, wxString &Selected, const TranslatableStrings &choices );
wxChoice * TieChoice(
const wxString &Prompt, int &Selected, const TranslatableStrings &choices );
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);
@@ -536,7 +538,9 @@ private:
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 );
wxChoice * DoTieChoice(
const wxString &Prompt, WrappedType & WrappedRef,
const TranslatableStrings & 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 );
@@ -718,6 +722,7 @@ public:
// Calculate width of a choice control adequate for the items, maybe after
// the dialog is created but the items change.
static void SetMinSize( wxWindow *window, const TranslatableStrings & items );
static void SetMinSize( wxWindow *window, const wxArrayStringEx & items );
// static void SetMinSize( wxWindow *window, const std::vector<int> & items );