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

Accessors to get the project window...

Browse Source 
... as a preparation for splitting up class AudacityProject.

Use ProjectWindow as an alias for AudacityProject, and fetch it from the
project with a static member function, where certain of its services are used;
pretending they are not the same class.

Use global accessor functions to get wxFrame from the project where only
wxFrame's member functions are needed, so there will be less dependency on
ProjectWindow when it becomes a distinct class.
This commit is contained in:
Paul Licameli
2019-05-28 13:12:56 -04:00
parent 02afcbca8c
commit 82663892dc
49 changed files with 451 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/AudacityApp.cpp
View File

@@ -956,9 +956,10 @@ void AudacityApp::OnTimer(wxTimerEvent& WXUNUSED(event))
// Get the users attention
AudacityProject *project = GetActiveProject();
if (project) {
project->Maximize();
project->Raise();
project->RequestUserAttention();
auto &window = GetProjectFrame( *project );
window.Maximize();
window.Raise();
window.RequestUserAttention();
}
continue;
}
@@ -989,8 +990,9 @@ void AudacityApp::OnTimer(wxTimerEvent& WXUNUSED(event))
// if there are no projects open, don't show the warning (user has closed it)
if (offendingProject) {
offendingProject->Iconize(false);
offendingProject->Raise();
auto &window = GetProjectFrame( *offendingProject );
window.Iconize(false);
window.Raise();
wxString errorMessage = wxString::Format(_(
"One or more external audio files could not be found.\n\
@@ -1074,7 +1076,7 @@ bool AudacityApp::OnExceptionInMainLoop()
// Forget pending changes in the TrackList
TrackList::Get( *pProject ).ClearPendingTracks();
pProject->RedrawProject();
ProjectWindow::Get( *pProject ).RedrawProject();
}
// Give the user an alert
@@ -1512,8 +1514,9 @@ bool AudacityApp::OnInit()
wxWindow * pWnd = MakeHijackPanel();
if (pWnd)
{
project->Show(false);
pWnd->SetParent(project);
auto &window = GetProjectFrame( *project );
window.Show(false);
pWnd->SetParent( &window );
SetTopWindow(pWnd);
pWnd->Show(true);
}