From bcc2e0d13b7e8a9dd2ac6fef6de74dc526870c7b Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Thu, 28 Mar 2019 03:29:15 -0400
Subject: [PATCH] Remove wx/frame.h, wx/sizer.h, wx/access.h from headers

---
 src/AboutDialog.h                                           | 1 -
 src/AudacityLogger.h                                        | 3 ++-
 src/BatchCommandDialog.h                                    | 1 -
 src/BatchProcessDialog.h                                    | 1 -
 src/FreqWindow.h                                            | 2 --
 src/HistoryWindow.h                                         | 1 -
 src/LyricsWindow.h                                          | 2 +-
 src/MixerBoard.h                                            | 2 +-
 src/Project.h                                               | 3 +--
 src/Screenshot.cpp                                          | 1 +
 src/ShuttleGui.h                                            | 2 +-
 src/SplashDialog.h                                          | 1 -
 src/TrackPanelAx.h                                          | 1 -
 src/effects/Contrast.h                                      | 1 -
 src/effects/EffectRack.cpp                                  | 1 -
 src/effects/EffectRack.h                                    | 5 ++---
 src/effects/Equalization.cpp                                | 1 +
 src/effects/Equalization.h                                  | 5 +++--
 src/effects/ScoreAlignDialog.h                              | 1 -
 src/effects/VST/VSTEffect.cpp                               | 1 -
 src/effects/nyquist/Nyquist.cpp                             | 1 +
 src/effects/nyquist/Nyquist.h                               | 1 -
 src/toolbars/ControlToolBar.cpp                             | 1 +
 src/toolbars/ToolBar.h                                      | 2 +-
 src/toolbars/ToolManager.cpp                                | 1 +
 src/toolbars/ToolManager.h                                  | 2 +-
 src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp | 1 +
 src/widgets/AButton.h                                       | 1 -
 src/widgets/ASlider.h                                       | 1 -
 src/widgets/Grid.h                                          | 1 -
 src/widgets/KeyView.h                                       | 1 -
 src/widgets/LinkingHtmlWindow.cpp                           | 1 +
 src/widgets/LinkingHtmlWindow.h                             | 1 -
 src/widgets/NumericTextCtrl.h                               | 1 -
 src/widgets/WindowAccessible.h                              | 2 +-
 35 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/src/AboutDialog.h b/src/AboutDialog.h
index 83e0dfc73..6f14a1844 100644
--- a/src/AboutDialog.h
+++ b/src/AboutDialog.h
@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/sizer.h>
 #include <wx/statbmp.h>
 #include <wx/bitmap.h>
 #include "widgets/wxPanelWrapper.h"
diff --git a/src/AudacityLogger.h b/src/AudacityLogger.h
index afbd2dcee..dca170323 100644
--- a/src/AudacityLogger.h
+++ b/src/AudacityLogger.h
@@ -20,8 +20,9 @@
 
 #include "MemoryX.h"
 #include <wx/log.h>
-#include <wx/frame.h>
+#include <wx/event.h> // to inherit wxEvtHandler
 
+class wxFrame;
 class wxTextCtrl;
 
 class AudacityLogger final : public wxEvtHandler, public wxLog {
diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h
index 2dfd0c780..fa9355934 100644
--- a/src/BatchCommandDialog.h
+++ b/src/BatchCommandDialog.h
@@ -19,7 +19,6 @@
 #endif
 
 //#include  "wx/log.h"
-#include  <wx/sizer.h>
 #include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 
diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h
index 7258ea7bd..ba2ef89b5 100644
--- a/src/BatchProcessDialog.h
+++ b/src/BatchProcessDialog.h
@@ -19,7 +19,6 @@
 #endif
 
 //#include  "wx/log.h"
-#include  <wx/sizer.h>
 #include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 
diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index 1f1b9aed8..908d07dca 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -15,7 +15,6 @@
 #include <vector>
 #include <wx/brush.h>
 #include <wx/dcmemory.h>
-#include <wx/frame.h>
 #include <wx/panel.h>
 #include <wx/checkbox.h>
 #include <wx/dialog.h>
@@ -23,7 +22,6 @@
 #include <wx/pen.h>
 #include <wx/font.h>
 #include <wx/scrolbar.h>
-#include <wx/sizer.h>
 #include <wx/statusbr.h>
 #include <wx/utils.h>
 #include "SampleFormat.h"
diff --git a/src/HistoryWindow.h b/src/HistoryWindow.h
index 651953bdc..7c6d09c41 100644
--- a/src/HistoryWindow.h
+++ b/src/HistoryWindow.h
@@ -12,7 +12,6 @@
 #define __AUDACITY_HISTORY_WINDOW__
 
 #include <wx/button.h>
-#include <wx/frame.h>
 #include <wx/listctrl.h>
 #include <wx/spinctrl.h>
 
diff --git a/src/LyricsWindow.h b/src/LyricsWindow.h
index eb21febdf..ed30428cf 100644
--- a/src/LyricsWindow.h
+++ b/src/LyricsWindow.h
@@ -12,7 +12,7 @@
 #ifndef __AUDACITY_LYRICS_WINDOW__
 #define __AUDACITY_LYRICS_WINDOW__
 
-#include <wx/frame.h>
+#include <wx/frame.h> // to inherit
 
 class AudacityProject;
 class LyricsPanel;
diff --git a/src/MixerBoard.h b/src/MixerBoard.h
index eafaafc28..ef860a542 100644
--- a/src/MixerBoard.h
+++ b/src/MixerBoard.h
@@ -14,7 +14,7 @@
 #ifndef __AUDACITY_MIXER_BOARD__
 #define __AUDACITY_MIXER_BOARD__
 
-#include <wx/frame.h>
+#include <wx/frame.h> // to inherit
 #include <wx/bmpbuttn.h>
 #include <wx/hashmap.h>
 #include <wx/image.h>
diff --git a/src/Project.h b/src/Project.h
index 345562306..9a76ebcdc 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -38,7 +38,7 @@
 #include <wx/log.h>
 #include <wx/dragimag.h>
 #include <wx/generic/dragimgg.h>
-#include <wx/frame.h>
+#include <wx/frame.h> // to inherit
 #include <wx/intl.h>
 #include <wx/dcclient.h>
 
@@ -49,7 +49,6 @@ const int AudacityProjectTimerID = 5200;
 class wxArrayString;
 class wxWindow;
 class wxDialog;
-class wxBoxSizer;
 class wxScrollEvent;
 class wxScrollBar;
 class wxPanel;
diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp
index ef9f0b09a..4ee3437e5 100644
--- a/src/Screenshot.cpp
+++ b/src/Screenshot.cpp
@@ -32,6 +32,7 @@ It forwards the actual work of doing the commands to the ScreenshotCommand.
 #include <wx/image.h>
 #include <wx/intl.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/statusbr.h>
 #include <wx/textctrl.h>
 #include <wx/timer.h>
diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h
index b74cc2f06..6b1c7033b 100644
--- a/src/ShuttleGui.h
+++ b/src/ShuttleGui.h
@@ -19,7 +19,6 @@
 #include <vector>
 #include "MemoryX.h"
 #include <wx/grid.h>
-#include <wx/sizer.h>
 
 #include "WrappedType.h"
 
@@ -68,6 +67,7 @@ class wxRadioButton;
 class wxBitmap;
 class wxPanel;
 class wxSizer;
+class wxSizerItem;
 class wxStaticBox;
 class wxMenuBar;
 class wxMenu;
diff --git a/src/SplashDialog.h b/src/SplashDialog.h
index d899f487d..e1712bc26 100644
--- a/src/SplashDialog.h
+++ b/src/SplashDialog.h
@@ -15,7 +15,6 @@
 #include <wx/dialog.h>
 #include "widgets/wxPanelWrapper.h"
 
-class wxBoxSizer;
 class wxStaticBitmap;
 class wxBitmap;
 class ShuttleGui;
diff --git a/src/TrackPanelAx.h b/src/TrackPanelAx.h
index d2405a977..47cd6b889 100644
--- a/src/TrackPanelAx.h
+++ b/src/TrackPanelAx.h
@@ -17,7 +17,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #if wxUSE_ACCESSIBILITY
-#include <wx/access.h>
 #include "widgets/WindowAccessible.h"
 #endif
 
diff --git a/src/effects/Contrast.h b/src/effects/Contrast.h
index 023998bdf..ed1c81aba 100644
--- a/src/effects/Contrast.h
+++ b/src/effects/Contrast.h
@@ -12,7 +12,6 @@
 #include "../widgets/wxPanelWrapper.h"
 
 class wxButton;
-class wxSizer;
 class wxString;
 class wxTextCtrl;
 
diff --git a/src/effects/EffectRack.cpp b/src/effects/EffectRack.cpp
index 61c7a22a9..9a924fa06 100644
--- a/src/effects/EffectRack.cpp
+++ b/src/effects/EffectRack.cpp
@@ -21,7 +21,6 @@
 #include "../MemoryX.h"
 #include "../UndoManager.h"
 
-#include <wx/access.h>
 #include <wx/defs.h>
 #include <wx/bmpbuttn.h>
 #include <wx/button.h>
diff --git a/src/effects/EffectRack.h b/src/effects/EffectRack.h
index 870e7bb6b..e41d14e08 100644
--- a/src/effects/EffectRack.h
+++ b/src/effects/EffectRack.h
@@ -18,17 +18,16 @@
 
 #if defined(EXPERIMENTAL_EFFECTS_RACK)
 
-#include <wx/access.h>
 #include <wx/bmpbuttn.h>
 #include <wx/defs.h>
-#include <wx/frame.h>
+#include <wx/frame.h> // to inherit
 #include <wx/image.h>
 #include <wx/panel.h>
-#include <wx/sizer.h>
 #include <wx/timer.h>
 
 #include "EffectManager.h"
 
+class wxFlexGridSizer;
 class wxStaticText;
 
 class EffectRack final : public wxFrame
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index ec2ec6295..de4c28f2b 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -80,6 +80,7 @@
 #include <wx/filefn.h>
 #include <wx/stdpaths.h>
 #include <wx/settings.h>
+#include <wx/sizer.h>
 #include <wx/checkbox.h>
 #include <wx/tooltip.h>
 #include <wx/utils.h>
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index d464cc422..5269913cd 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -23,13 +23,11 @@
 #include <wx/dialog.h>
 #include <wx/intl.h>
 #include <wx/listctrl.h>
-#include <wx/sizer.h>
 #include <wx/bitmap.h>
 #include <wx/radiobut.h>
 #include <wx/checkbox.h>
 
 #if wxUSE_ACCESSIBILITY
-#include <wx/access.h>
 #include "../widgets/WindowAccessible.h"
 #endif
 
@@ -53,7 +51,10 @@ const int kEqOptionCurve   =1<<1;
 // The legacy version offers both Graphic and curve on the same UI.
 const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
 
+class wxBoxSizer;
 class wxChoice;
+class wxSizer;
+class wxSizerItem;
 class wxSlider;
 class wxStaticText;
 class Envelope;
diff --git a/src/effects/ScoreAlignDialog.h b/src/effects/ScoreAlignDialog.h
index 6479f502b..64742f749 100644
--- a/src/effects/ScoreAlignDialog.h
+++ b/src/effects/ScoreAlignDialog.h
@@ -54,7 +54,6 @@ extern int scorealign(
 #endif
 
 class wxButton;
-class wxSizer;
 class wxString;
 class wxSlider;
 class wxStaticText;
diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp
index 717b58905..1590bb119 100644
--- a/src/effects/VST/VSTEffect.cpp
+++ b/src/effects/VST/VSTEffect.cpp
@@ -53,7 +53,6 @@
 #include <wx/dcclient.h>
 #include <wx/file.h>
 #include <wx/filename.h>
-#include <wx/frame.h>
 #include <wx/imaglist.h>
 #include <wx/listctrl.h>
 #include <wx/log.h>
diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp
index 22c10c189..39bfdeb33 100644
--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@@ -39,6 +39,7 @@ effects from this one class.
 #include <wx/datetime.h>
 #include <wx/intl.h>
 #include <wx/log.h>
+#include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/sstream.h>
 #include <wx/stattext.h>
diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h
index f34a78a7c..ae985d7ae 100644
--- a/src/effects/nyquist/Nyquist.h
+++ b/src/effects/nyquist/Nyquist.h
@@ -15,7 +15,6 @@
 #include <wx/datetime.h>
 #include <wx/dialog.h>
 #include <wx/intl.h>
-#include <wx/sizer.h>
 #include <wx/textbuf.h>
 #include <wx/tokenzr.h>
 
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 368ef1adb..31ef14155 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -51,6 +51,7 @@
 #include <wx/event.h>
 #include <wx/image.h>
 #include <wx/intl.h>
+#include <wx/sizer.h>
 #include <wx/statusbr.h>
 #include <wx/timer.h>
 #endif
diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h
index e4a91dc3f..3833a750d 100644
--- a/src/toolbars/ToolBar.h
+++ b/src/toolbars/ToolBar.h
@@ -17,11 +17,11 @@
 
 #include <vector>
 #include <wx/defs.h>
-#include <wx/sizer.h>
 
 #include "../Theme.h"
 #include "../widgets/wxPanelWrapper.h"
 
+class wxBoxSizer;
 class wxDC;
 class wxEraseEvent;
 class wxMouseEvent;
diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index 22dfa6d04..ce85d7f67 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -41,6 +41,7 @@
 #include <wx/intl.h>
 #include <wx/region.h>
 #include <wx/settings.h>
+#include <wx/sizer.h>
 #include <wx/sysopt.h>
 #include <wx/timer.h>
 #include <wx/utils.h>
diff --git a/src/toolbars/ToolManager.h b/src/toolbars/ToolManager.h
index 57a17a585..c00bc604a 100644
--- a/src/toolbars/ToolManager.h
+++ b/src/toolbars/ToolManager.h
@@ -16,7 +16,7 @@
 #include "../MemoryX.h"
 #include <wx/defs.h>
 #include <wx/eventfilter.h>
-#include <wx/frame.h>
+#include <wx/frame.h> // to inherit
 #include <wx/timer.h>
 
 #include "ToolDock.h"
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
index df14d97fe..3cdfd7e44 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
@@ -35,6 +35,7 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../../../widgets/ErrorDialog.h"
 
 #include <wx/combobox.h>
+#include <wx/sizer.h>
 
 namespace
 {
diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h
index ea8f06ec7..2a8a020d5 100644
--- a/src/widgets/AButton.h
+++ b/src/widgets/AButton.h
@@ -18,7 +18,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #if wxUSE_ACCESSIBILITY
-#include <wx/access.h>
 #include "WindowAccessible.h"
 #endif
 
diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h
index 8ba089ceb..e840ea76d 100644
--- a/src/widgets/ASlider.h
+++ b/src/widgets/ASlider.h
@@ -21,7 +21,6 @@
 #include "widgets/wxPanelWrapper.h"
 
 #if wxUSE_ACCESSIBILITY
-#include <wx/access.h>
 #include "WindowAccessible.h"
 #endif
 
diff --git a/src/widgets/Grid.h b/src/widgets/Grid.h
index 7032cfb9d..84a7898ae 100644
--- a/src/widgets/Grid.h
+++ b/src/widgets/Grid.h
@@ -20,7 +20,6 @@
 #include "../Internat.h"
 
 #if wxUSE_ACCESSIBILITY
-#include <wx/access.h>
 #include "WindowAccessible.h"
 
 class GridAx;
diff --git a/src/widgets/KeyView.h b/src/widgets/KeyView.h
index 0f62dbbe8..ccb7ead2f 100644
--- a/src/widgets/KeyView.h
+++ b/src/widgets/KeyView.h
@@ -67,7 +67,6 @@ enum ViewByType
 };
 
 #if wxUSE_ACCESSIBILITY
-#include <wx/access.h>
 #include "WindowAccessible.h"
 
 // Forward reference accessibility provideer
diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp
index 5eaf6be36..6349ec126 100644
--- a/src/widgets/LinkingHtmlWindow.cpp
+++ b/src/widgets/LinkingHtmlWindow.cpp
@@ -21,6 +21,7 @@
 
 #include <wx/mimetype.h>
 #include <wx/filename.h>
+#include <wx/frame.h>
 #include <wx/uri.h>
 #include <wx/settings.h>
 #include <wx/log.h>
diff --git a/src/widgets/LinkingHtmlWindow.h b/src/widgets/LinkingHtmlWindow.h
index dd8f5abe7..371865c48 100644
--- a/src/widgets/LinkingHtmlWindow.h
+++ b/src/widgets/LinkingHtmlWindow.h
@@ -17,7 +17,6 @@
 #define __AUDACITY_LINKINGHTMLWINDOW__
 
 #include <wx/html/htmlwin.h>
-#include <wx/frame.h>
 
 #include "HtmlWindow.h"
 #include "wxPanelWrapper.h"
diff --git a/src/widgets/NumericTextCtrl.h b/src/widgets/NumericTextCtrl.h
index 9829b41d3..265f47a3a 100644
--- a/src/widgets/NumericTextCtrl.h
+++ b/src/widgets/NumericTextCtrl.h
@@ -28,7 +28,6 @@
 #include "../Internat.h"
 
 #if wxUSE_ACCESSIBILITY
-#include <wx/access.h>
 #include "WindowAccessible.h"
 #endif
 
diff --git a/src/widgets/WindowAccessible.h b/src/widgets/WindowAccessible.h
index 4984352ef..d771d1518 100644
--- a/src/widgets/WindowAccessible.h
+++ b/src/widgets/WindowAccessible.h
@@ -15,7 +15,7 @@
 
 #if wxUSE_ACCESSIBILITY
 
-#include <wx/access.h>
+#include <wx/access.h> // to inherit
 
 class WindowAccessible: public wxAccessible
 {