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

Pass AudacityProject * into preference panel factories

Browse Source
This commit is contained in:
Paul Licameli
2020-01-04 12:24:14 -05:00
parent 72f66b7096
commit c9a9c06bd0
29 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/AudacityApp.cpp
View File

@@ -1658,8 +1658,9 @@ bool AudacityApp::OnInit()
// Only want one page of the preferences
PrefsDialog::Factories factories;
factories.push_back(KeyConfigPrefsFactory( id ));
auto pWindow = FindProjectFrame( GetActiveProject() );
GlobalPrefsDialog dialog( pWindow, factories );
const auto pProject = GetActiveProject();
auto pWindow = FindProjectFrame( pProject );
GlobalPrefsDialog dialog( pWindow, pProject, factories );
dialog.ShowModal();
MenuCreator::RebuildAllMenuBars();
return true;
@@ -1796,7 +1797,7 @@ bool AudacityApp::InitTempDir()
// Only want one page of the preferences
PrefsDialog::Factories factories;
factories.push_back(DirectoriesPrefsFactory());
GlobalPrefsDialog dialog(NULL, factories);
GlobalPrefsDialog dialog(nullptr, nullptr, factories);
dialog.ShowModal();
AudacityMessageBox(XO(
@@ -2248,7 +2249,7 @@ void AudacityApp::OnMenuPreferences(wxCommandEvent & event)
// all platforms.
if(AllProjects{}.empty()) {
GlobalPrefsDialog dialog(NULL /* parent */ );
GlobalPrefsDialog dialog(nullptr /* parent */, nullptr );
dialog.ShowModal();
}
else