Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-25 07:43:54 +02:00
Code Issues Releases Wiki Activity

Remove wxArray(Int|Long|Double) except where wxWidgets fns need it

Browse Source
This commit is contained in:
Paul Licameli
2018-02-02 14:49:46 -05:00
parent 080dd34e61
commit 8be1e8fdad
35 changed files with 214 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ShuttleGui.h
View File

@@ -16,6 +16,7 @@
#include "Audacity.h"
#include <vector>
#include "MemoryX.h"
#include <wx/grid.h>
#include <wx/sizer.h>
@@ -41,7 +42,6 @@ enum teShuttleMode
eIsSavingToPrefs
};
class wxArrayInt;
class wxListCtrl;
class wxCheckBox;
class wxChoice;
@@ -149,8 +149,8 @@ public:
bool DoStep( int iStep );
int TranslateToIndex( const wxString &Value, const wxArrayString &Choices );
wxString TranslateFromIndex( const int nIn, const wxArrayString &Choices );
int TranslateToIndex( const int Value, const wxArrayInt &Choices );
int TranslateFromIndex( const int nIn, const wxArrayInt &Choices );
int TranslateToIndex( const int Value, const std::vector<int> &Choices );
int TranslateFromIndex( const int nIn, const std::vector<int> &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.
@@ -212,7 +212,7 @@ public:
const wxString &SettingName,
const int Default,
const wxArrayString & Choices,
const wxArrayInt & TranslatedChoices);
const std::vector<int> & TranslatedChoices);
wxTextCtrl * TieTextBox(
const wxString &Prompt,
const wxString &SettingName,
@@ -380,9 +380,9 @@ public:
void SetSizeHints( int minX = -1, int minY = -1 );
void SetSizeHints( const wxArrayString & items );
void SetSizeHints( const wxArrayInt & items );
void SetSizeHints( const std::vector<int> & items );
static void SetSizeHints( wxWindow *window, const wxArrayString & items );
static void SetSizeHints( wxWindow *window, const wxArrayInt & items );
static void SetSizeHints( wxWindow *window, const std::vector<int> & items );
teShuttleMode GetMode() { return mShuttleMode; };
};