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

Merge branch 'master' into wx3

Browse Source
This commit is contained in:
Leland Lucius
2015-06-30 11:30:48 -05:00
parent d1f66d768f b99f1b90fb
commit c6dffaaaa4
128 changed files with 25654 additions and 33376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/prefs/TracksPrefs.cpp
View File

@@ -20,16 +20,24 @@
#include "../Audacity.h"
#include "TracksPrefs.h"
#include <algorithm>
#include <wx/defs.h>
#include "../Experimental.h"
#include "../Prefs.h"
#include "../ShuttleGui.h"
#include "../WaveTrack.h"
////////////////////////////////////////////////////////////////////////////////
TracksPrefs::TracksPrefs(wxWindow * parent)
: PrefsPanel(parent, _("Tracks"))
{
// Bugs 1043, 1044
// First rewrite legacy preferences
gPrefs->Write(wxT("/GUI/DefaultViewModeNew"),
WaveTrack::FindDefaultViewMode());
Populate();
}
@@ -92,8 +100,9 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
S.StartMultiColumn(2);
{
S.TieChoice(_("Default &View Mode:"),
wxT("/GUI/DefaultViewMode"),
wxT("/GUI/DefaultViewModeNew"),
0,
mViewChoices,
mViewCodes);