diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 4216f4a47..762fbedf2 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -245,7 +245,6 @@ It handles initialization and termination by subclassing wxApp. /// Custom events //////////////////////////////////////////////////////////// -DEFINE_EVENT_TYPE(EVT_OPEN_AUDIO_FILE); wxDEFINE_EVENT(EVT_LANGUAGE_CHANGE, wxCommandEvent); #if 0 diff --git a/src/AudacityApp.h b/src/AudacityApp.h index 0060983ba..d21604c8a 100644 --- a/src/AudacityApp.h +++ b/src/AudacityApp.h @@ -48,9 +48,6 @@ void QuitAudacity(); extern bool gIsQuitting; -// Asynchronous open -DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_OPEN_AUDIO_FILE, -1); - class BlockFile; class AliasBlockFile; diff --git a/src/Project.cpp b/src/Project.cpp index d37cf6d1f..1abefc8bb 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -943,6 +943,13 @@ enum { }; +// PRL: This event type definition used to be in AudacityApp.h, which created +// a bad compilation dependency. The event was never emitted anywhere. I +// preserve it and its handler here but I move it to remove the dependency. +// Asynchronous open +DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_OPEN_AUDIO_FILE, -1); +DEFINE_EVENT_TYPE(EVT_OPEN_AUDIO_FILE); + BEGIN_EVENT_TABLE(AudacityProject, wxFrame) EVT_MENU(wxID_ANY, AudacityProject::OnMenu) EVT_MOUSE_EVENTS(AudacityProject::OnMouseEvent)