Remove wx/window.h from headers

src/AdornedRulerPanel.h

@@ -19,7 +19,6 @@
 #include <wx/dc.h>
 #include <wx/dcmemory.h>
 #include <wx/font.h>
-#include <wx/window.h>
 
 class ViewInfo;
 class AudacityProject;

src/TrackPanelAx.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_TRACK_PANEL_ACCESSIBILITY__
 
 #include <memory>
-#include <wx/window.h>
 #include <wx/panel.h>
 
 #include <wx/setup.h> // for wxUSE_* macros

src/effects/AutoDuck.h

@@ -14,7 +14,6 @@
 #include <wx/bitmap.h>
 #include <wx/gdicmn.h>
 #include <wx/textctrl.h>
-#include <wx/window.h>
 
 #include "Effect.h"
 #include "../widgets/wxPanelWrapper.h"

src/effects/Compressor.h

@@ -14,7 +14,6 @@
 #include <wx/bitmap.h>
 #include <wx/checkbox.h>
 #include <wx/gdicmn.h>
-#include <wx/window.h>
 #include "../widgets/wxPanelWrapper.h"
 
 #include "TwoPassSimpleMono.h"

src/effects/ScienFilter.h

@@ -18,7 +18,6 @@ Vaughan Johnson (Preview)
 #include <wx/bitmap.h>
 #include <wx/choice.h>
 #include <wx/panel.h>
-#include <wx/window.h>
 
 #include "Biquad.h"
 

src/prefs/BatchPrefs.h

@@ -14,8 +14,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/prefs/DevicePrefs.h

@@ -15,7 +15,6 @@
 #include <wx/defs.h>
 
 #include <wx/choice.h>
-#include <wx/window.h>
 
 #include "PrefsPanel.h"
 

src/prefs/EffectsPrefs.h

@@ -15,8 +15,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/prefs/ExtImportPrefs.h

@@ -13,7 +13,6 @@
 
 #include <wx/defs.h>
 #include <wx/dnd.h>
-#include <wx/window.h>
 #include "../widgets/Grid.h"
 
 #include "PrefsPanel.h"

src/prefs/GUIPrefs.h

@@ -15,8 +15,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/prefs/ImportExportPrefs.h

@@ -15,8 +15,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/prefs/LibraryPrefs.h

@@ -15,8 +15,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class wxStaticText;

src/prefs/MidiIOPrefs.h

@@ -22,7 +22,6 @@ class ShuttleGui;
 #include <wx/defs.h>
 
 #include <wx/choice.h>
-#include <wx/window.h>
 
 #include "PrefsPanel.h"
 

src/prefs/ModulePrefs.h

@@ -15,8 +15,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 

src/prefs/MousePrefs.h

@@ -12,7 +12,6 @@
 #include <wx/defs.h>
 
 #include <wx/listctrl.h>
-#include <wx/window.h>
 
 #include "PrefsPanel.h"
 

src/prefs/PlaybackPrefs.h

@@ -14,8 +14,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/prefs/PrefsDialog.h

@@ -16,7 +16,6 @@
 #include <wx/button.h>
 #include <wx/dialog.h>
 #include <wx/treebook.h>
-#include <wx/window.h>
 #include "../widgets/wxPanelWrapper.h"
 #include "../Internat.h"
 

src/prefs/PrefsPanel.h

@@ -33,7 +33,6 @@ PrefsPanel.
 #ifndef __AUDACITY_PREFS_PANEL__
 #define __AUDACITY_PREFS_PANEL__
 
-#include <wx/window.h>
 #include "../widgets/wxPanelWrapper.h"
 
 /* A few constants for an attempt at semi-uniformity */

src/prefs/ProjectsPrefs.h

@@ -15,8 +15,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/prefs/RecordingPrefs.h

@@ -15,8 +15,6 @@
 #include <wx/defs.h>
 #include <wx/textctrl.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/prefs/SpectrumPrefs.h

@@ -24,7 +24,6 @@
 #include "../Experimental.h"
 
 #include <wx/defs.h>
-#include <wx/window.h>
 
 #include "../WaveTrack.h"
 

src/prefs/ThemePrefs.h

@@ -15,7 +15,6 @@
 #define __AUDACITY_THEME_PREFS__
 
 #include <wx/defs.h>
-#include <wx/window.h>
 
 #include "PrefsPanel.h"
 

src/prefs/TracksPrefs.h

@@ -15,8 +15,6 @@
 
 //#include <wx/defs.h>
 
-//#include <wx/window.h>
-
 #include <vector>
 #include "PrefsPanel.h"
 #include "../WaveTrack.h"

src/prefs/WarningsPrefs.h

@@ -15,8 +15,6 @@
 
 #include <wx/defs.h>
 
-#include <wx/window.h>
-
 #include "PrefsPanel.h"
 
 class ShuttleGui;

src/widgets/AButton.h

@@ -23,7 +23,6 @@
 #endif
 
 #include <wx/image.h>
-#include <wx/window.h>
 
 #include "ImageRoll.h"
 

src/widgets/ASlider.h

@@ -16,7 +16,6 @@
 #include "../MemoryX.h"
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/window.h>
 #include <wx/panel.h>
 #include <wx/timer.h>
 #include "widgets/wxPanelWrapper.h"

src/widgets/ErrorDialog.h

@@ -16,7 +16,6 @@
 
 #include <wx/defs.h>
 #include <wx/msgdlg.h>
-#include <wx/window.h>
 #include "LinkingHtmlWindow.h"
 #include "wxPanelWrapper.h"
 

src/widgets/FileHistory.h

@@ -16,7 +16,6 @@
 #include <wx/defs.h>
 #include <wx/choice.h>
 #include <wx/grid.h>
-#include <wx/window.h>
 #include <wx/weakref.h>
 
 #include "audacity/Types.h"

src/widgets/Grabber.h

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

src/widgets/Grid.h

@@ -17,7 +17,6 @@
 #include <wx/defs.h>
 #include <wx/choice.h>
 #include <wx/grid.h>
-#include <wx/window.h>
 #include "NumericTextCtrl.h"
 #include "../Internat.h"
 

src/widgets/HelpSystem.h

@@ -15,7 +15,6 @@
 #include "../Audacity.h"
 
 #include <wx/defs.h>
-#include <wx/window.h>
 #include "wxPanelWrapper.h"
 
 class AudacityProject;

src/widgets/MultiDialog.h

@@ -15,8 +15,8 @@
 #define __AUDACITY_MULTIDIALOG__
 
 #include <wx/defs.h>
-#include <wx/window.h>
 
+#include <wx/chartype.h>
 class wxString;
 
 const wxString &DefaultMultiDialogMessage();

src/widgets/Warning.h

@@ -14,7 +14,7 @@
 #include "../Audacity.h"
 
 #include <wx/defs.h>
-#include <wx/window.h>
+class wxString;
 
 // "Don't show this warning again"
  const wxString &DefaultWarningFooter();