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

Don't call QuitAudacity directly from src/menus...

Browse Source 
... This cuts link dependency on AudacityApp.cpp, and allows the function to
be private to that file
This commit is contained in:
Paul Licameli
2019-04-26 00:43:17 -04:00
parent 187e3be0d6
commit 6cde697a8e
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/AudacityApp.cpp
View File

@@ -266,7 +266,7 @@ static void wxOnAssert(const wxChar *fileName, int lineNumber, const wxChar *msg
static bool gInited = false;
static bool gIsQuitting = false;
void QuitAudacity(bool bForce)
static void QuitAudacity(bool bForce)
{
// guard against recursion
if (gIsQuitting)
@@ -323,7 +323,7 @@ void QuitAudacity(bool bForce)
}
}
void QuitAudacity()
static void QuitAudacity()
{
QuitAudacity(false);
}
@@ -647,9 +647,14 @@ BEGIN_EVENT_TABLE(AudacityApp, wxApp)
EVT_MENU(wxID_OPEN, AudacityApp::OnMenuOpen)
EVT_MENU(wxID_ABOUT, AudacityApp::OnMenuAbout)
EVT_MENU(wxID_PREFERENCES, AudacityApp::OnMenuPreferences)
EVT_MENU(wxID_EXIT, AudacityApp::OnMenuExit)
#endif
// Associate the handler with the menu id on all operating systems, even
// if they don't have an application menu bar like in macOS, so that
// other parts of the program can send the application a shut-down
// event
EVT_MENU(wxID_EXIT, AudacityApp::OnMenuExit)
#ifndef __WXMSW__
EVT_SOCKET(ID_IPC_SERVER, AudacityApp::OnServerEvent)
EVT_SOCKET(ID_IPC_SOCKET, AudacityApp::OnSocketEvent)