Remove wx/event.h from headers

src/AdornedRulerPanel.h

@@ -18,7 +18,6 @@
 #include <wx/bitmap.h>
 #include <wx/dc.h>
 #include <wx/dcmemory.h>
-#include <wx/event.h>
 #include <wx/font.h>
 #include <wx/window.h>
 

src/AudacityApp.h

@@ -23,7 +23,6 @@
 #include <wx/app.h>
 #include <wx/cmdline.h>
 #include <wx/dir.h>
-#include <wx/event.h>
 #include <wx/docview.h>
 #include <wx/intl.h>
 #include <wx/snglinst.h>

src/AudacityLogger.h

@@ -19,7 +19,6 @@
 #include "Experimental.h"
 
 #include "MemoryX.h"
-#include <wx/event.h>
 #include <wx/log.h>
 #include <wx/frame.h>
 #include <wx/textctrl.h>

src/AudioIO.h

@@ -48,7 +48,7 @@ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
 #include "../lib-src/portmixer/include/portmixer.h"
 #endif
 
-#include <wx/event.h>
+#include <wx/event.h> // to declare custom event types
 #include <wx/thread.h>
 
 #include "SampleFormat.h"

src/DeviceChange.h

@@ -25,7 +25,6 @@
 
 #if defined(HAVE_DEVICE_CHANGE)
 
-#include <wx/event.h>
 #include <wx/timer.h>
 
 class DeviceChangeInterface /* not final */

src/HistoryWindow.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_HISTORY_WINDOW__
 
 #include <wx/button.h>
-#include <wx/event.h>
 #include <wx/frame.h>
 #include <wx/listctrl.h>
 #include <wx/spinctrl.h>

src/LabelDialog.h

@@ -13,7 +13,6 @@
 
 #include <vector>
 #include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/grid.h>
 
 #include "Internat.h"

src/LabelTrack.h

@@ -17,7 +17,6 @@
 #include "Track.h"
 
 #include <wx/brush.h>
-#include <wx/event.h>
 #include <wx/font.h>
 #include <wx/pen.h>
 #include <wx/clipbrd.h>

src/Project.h

@@ -35,7 +35,6 @@
 
 #include <memory>
 #include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/log.h>
 #include <wx/dragimag.h>
 #include <wx/generic/dragimgg.h>

src/TimeDialog.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_TimeDialog__
 
 #include <wx/defs.h>
-#include <wx/event.h>
 
 #include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol
 #include "widgets/wxPanelWrapper.h"

src/Track.h

@@ -19,7 +19,6 @@
 #include <vector>
 #include <list>
 #include <functional>
-#include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/longlong.h>
 

src/TranslatableStringArray.h

@@ -12,7 +12,6 @@ Paul Licameli
 #define __AUDACITY_TRANSLATABLE_STRING_ARRAY__
 
 #include <wx/app.h>
-#include <wx/event.h>
 
 class wxArrayStringEx;
 

src/UndoManager.h

@@ -51,7 +51,7 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/event.h>
+#include <wx/event.h> // to declare custom event types
 #include "ondemand/ODTaskThread.h"
 #include "SelectedRegion.h"
 

src/ViewInfo.h

@@ -12,7 +12,7 @@
 #define __AUDACITY_VIEWINFO__
 
 #include <vector>
-#include <wx/event.h>
+#include <wx/event.h> // inherit wxEvtHandler
 #include "SelectedRegion.h"
 #include "MemoryX.h"
 

src/commands/AppCommandEvent.h

@@ -18,7 +18,7 @@
 
 #include "../Audacity.h"
 
-#include <wx/event.h>
+#include <wx/event.h> // to declare custom event types
 #include "../MemoryX.h"
 
 DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, wxEVT_APP_COMMAND_RECEIVED, -1);

src/commands/AudacityCommand.h

@@ -22,7 +22,6 @@
 #include <wx/dynarray.h>
 #include <wx/intl.h>
 #include <wx/tglbtn.h>
-#include <wx/event.h> // for idle event.
 
 class wxCheckBox;
 class wxChoice;

src/commands/CommandContext.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_COMMAND_CONTEXT__
 #define __AUDACITY_COMMAND_CONTEXT__
 
-#include <wx/event.h>
 #include "audacity/Types.h"
 #include "../MemoryX.h"
 #include "Command.h"

src/commands/CommandFunctors.h

@@ -9,7 +9,6 @@
 #ifndef __AUDACITY_COMMAND_FUNCTORS__
 #define __AUDACITY_COMMAND_FUNCTORS__
 
-#include <wx/event.h>
 #include "../MemoryX.h"
 #include "Command.h"
 

src/commands/Demo.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_DEMO_COMMAND__
 #define __AUDACITY_DEMO_COMMAND__
 
-#include <wx/event.h>
 #include <wx/textctrl.h>
 
 #include "AudacityCommand.h"

src/commands/Keyboard.cpp

@@ -12,6 +12,8 @@
 #include "../Audacity.h"
 #include "Keyboard.h"
 
+#include <wx/event.h>
+
 NormalizedKeyString::NormalizedKeyString(const wxString & key)
 {
 #if defined(__WXMAC__)

src/commands/Keyboard.h

@@ -13,7 +13,9 @@
 #define __AUDACITY_KEYBOARD__
 
 #include <wx/defs.h>
-#include <wx/event.h>
+#include <wx/string.h> // to inherit
+
+class wxKeyEvent;
 
 struct NormalizedKeyString : private wxString
 {

src/effects/Amplify.h

@@ -16,7 +16,6 @@
 #define __AUDACITY_EFFECT_AMPLIFY__
 
 #include <wx/checkbox.h>
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 

src/effects/AutoDuck.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_EFFECT_AUTODUCK__
 
 #include <wx/bitmap.h>
-#include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/textctrl.h>
 #include <wx/window.h>

src/effects/BassTreble.h

@@ -12,7 +12,6 @@
 #ifndef __AUDACITY_EFFECT_BASS_TREBLE__
 #define __AUDACITY_EFFECT_BASS_TREBLE__
 
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>

src/effects/ChangePitch.h

@@ -27,7 +27,6 @@ the pitch without changing the tempo.
 #endif
 
 #include <wx/choice.h>
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/spinctrl.h>
 #include <wx/textctrl.h>

src/effects/ChangeSpeed.h

@@ -14,7 +14,6 @@
 #define __AUDACITY_EFFECT_CHANGESPEED__
 
 #include <wx/choice.h>
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 

src/effects/ChangeTempo.h

@@ -22,7 +22,6 @@
 #include <wx/checkbox.h>
 #endif
 
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 

src/effects/ClickRemoval.h

@@ -16,7 +16,6 @@
 #ifndef __AUDACITY_EFFECT_CLICK_REMOVAL__
 #define __AUDACITY_EFFECT_CLICK_REMOVAL__
 
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 

src/effects/Compressor.h

@@ -13,7 +13,6 @@
 
 #include <wx/bitmap.h>
 #include <wx/checkbox.h>
-#include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>

src/effects/DtmfGen.h

@@ -14,7 +14,6 @@
 #ifndef __AUDACITY_EFFECT_DTMF__
 #define __AUDACITY_EFFECT_DTMF__
 
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
 

src/effects/Echo.h

@@ -12,7 +12,6 @@
 #ifndef __AUDACITY_EFFECT_ECHO__
 #define __AUDACITY_EFFECT_ECHO__
 
-#include <wx/event.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"

src/effects/Effect.h

@@ -24,7 +24,6 @@
 #include <wx/defs.h>
 #include <wx/intl.h>
 #include <wx/tglbtn.h>
-#include <wx/event.h> // for idle event.
 
 class wxCheckBox;
 class wxChoice;

src/effects/EffectManager.h

@@ -17,7 +17,6 @@
 #include <vector>
 #include <wx/choice.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/listbox.h>
 
 #include "audacity/EffectInterface.h"

src/effects/Normalize.h

@@ -16,7 +16,6 @@
 #include "../Experimental.h"
 
 #include <wx/checkbox.h>
-#include <wx/event.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 

src/effects/Phaser.h

@@ -16,7 +16,6 @@
 #ifndef __AUDACITY_EFFECT_PHASER__
 #define __AUDACITY_EFFECT_PHASER__
 
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 

src/effects/Repeat.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EFFECT_REPEAT__
 #define __AUDACITY_EFFECT_REPEAT__
 
-#include <wx/event.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 

src/effects/Reverb.h

@@ -13,7 +13,6 @@
 #define __AUDACITY_EFFECT_REVERB__
 
 #include <wx/checkbox.h>
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/spinctrl.h>
 

src/effects/ScienFilter.h

@@ -17,7 +17,6 @@ Vaughan Johnson (Preview)
 
 #include <wx/bitmap.h>
 #include <wx/choice.h>
-#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>

src/effects/TimeScale.h

@@ -15,7 +15,6 @@
 
 #if USE_SBSMS
 
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 

src/effects/TruncSilence.h

@@ -17,7 +17,6 @@
 #ifndef __AUDACITY_EFFECT_TRUNC_SILENCE__
 #define __AUDACITY_EFFECT_TRUNC_SILENCE__
 
-#include <wx/event.h>
 #include <wx/list.h>
 
 #include "Effect.h"

src/effects/Wahwah.h

@@ -16,7 +16,6 @@
 #ifndef __AUDACITY_EFFECT_WAHWAH__
 #define __AUDACITY_EFFECT_WAHWAH__
 
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 

src/effects/lv2/LV2Effect.h

@@ -19,7 +19,6 @@ class wxArrayString;
 #include <vector>
 #include <wx/checkbox.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>

src/effects/vamp/VampEffect.h

@@ -17,7 +17,6 @@
 
 #include <wx/checkbox.h>
 #include <wx/choice.h>
-#include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>

src/prefs/PrefsDialog.h

@@ -14,7 +14,6 @@
 
 #include <vector>
 #include <wx/button.h>
-#include <wx/event.h>
 #include <wx/dialog.h>
 #include <wx/treebook.h>
 #include <wx/window.h>

src/tracks/ui/PlayIndicatorOverlay.h

@@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp
 #ifndef __AUDACITY_PLAY_INDICATOR_OVERLAY__
 #define __AUDACITY_PLAY_INDICATOR_OVERLAY__
 
-#include <wx/event.h>
+#include <wx/event.h> // to inherit
 #include "../../MemoryX.h"
 #include "../../widgets/Overlay.h"
 

src/tracks/ui/Scrubbing.h

@@ -15,7 +15,6 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "../../MemoryX.h"
 #include <vector>
-#include <wx/event.h>
 #include <wx/longlong.h>
 
 #include "../../widgets/Overlay.h"

src/tracks/ui/TrackButtonHandles.h

@@ -93,7 +93,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <wx/event.h>
 #include "../../widgets/PopupMenuTable.h"
 
 class MenuButtonHandle final : public ButtonHandle

src/widgets/FileHistory.h

@@ -15,7 +15,6 @@
 #include <algorithm>
 #include <wx/defs.h>
 #include <wx/choice.h>
-#include <wx/event.h>
 #include <wx/grid.h>
 #include <wx/window.h>
 #include <wx/weakref.h>

src/widgets/Grabber.h

@@ -33,7 +33,6 @@ flicker-free use.
 
 #include <wx/defs.h>
 #include <wx/dc.h>
-#include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/window.h>
 #include <wx/statbmp.h>

src/widgets/Grid.h

@@ -16,7 +16,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/choice.h>
-#include <wx/event.h>
 #include <wx/grid.h>
 #include <wx/window.h>
 #include "NumericTextCtrl.h"

src/widgets/NumericTextCtrl.h

@@ -22,7 +22,6 @@
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>

src/widgets/PopupMenuTable.h

@@ -21,7 +21,6 @@ tables, and automatically attaches and detaches the event handlers.
 class wxCommandEvent;
 class wxString;
 #include <vector>
-#include <wx/event.h>
 #include <wx/menu.h>
 #include "../MemoryX.h"