From 870c08ac064817498f6ff32232ec75235114b1b4 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 14 Nov 2018 15:23:25 -0500
Subject: [PATCH] Remove wx/{log.h, image.h, listctrl.h, utils.h} from headers

---
 src/AudacityApp.h            | 1 -
 src/AudacityLogger.h         | 2 +-
 src/BatchCommandDialog.h     | 1 -
 src/BatchProcessDialog.h     | 1 -
 src/DirManager.h             | 1 -
 src/FFmpeg.cpp               | 1 +
 src/FFmpeg.h                 | 2 --
 src/FileFormats.h            | 2 ++
 src/FreqWindow.h             | 1 -
 src/HistoryWindow.h          | 4 ++--
 src/MixerBoard.h             | 2 +-
 src/Project.h                | 1 -
 src/Theme.h                  | 2 +-
 src/effects/EffectRack.h     | 1 -
 src/effects/Equalization.h   | 3 ++-
 src/export/ExportMultiple.h  | 2 +-
 src/prefs/KeyConfigPrefs.h   | 1 -
 src/prefs/MousePrefs.h       | 3 +--
 src/toolbars/DeviceToolBar.h | 1 -
 src/toolbars/MixerToolBar.h  | 1 -
 src/widgets/AButton.h        | 4 ++--
 src/widgets/ASlider.h        | 1 -
 src/widgets/ProgressDialog.h | 1 -
 23 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/AudacityApp.h b/src/AudacityApp.h
index 53d998a5b..8d4a38669 100644
--- a/src/AudacityApp.h
+++ b/src/AudacityApp.h
@@ -26,7 +26,6 @@
 #include <wx/docview.h>
 #include <wx/intl.h>
 #include <wx/snglinst.h>
-#include <wx/log.h>
 #include <wx/socket.h>
 #include <wx/timer.h>
 
diff --git a/src/AudacityLogger.h b/src/AudacityLogger.h
index dca170323..2dd7cc98e 100644
--- a/src/AudacityLogger.h
+++ b/src/AudacityLogger.h
@@ -19,7 +19,7 @@
 #include "Experimental.h"
 
 #include "MemoryX.h"
-#include <wx/log.h>
+#include <wx/log.h> // to inherit
 #include <wx/event.h> // to inherit wxEvtHandler
 
 class wxFrame;
diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h
index 723bc3b16..2211d2a71 100644
--- a/src/BatchCommandDialog.h
+++ b/src/BatchCommandDialog.h
@@ -18,7 +18,6 @@
     #include  <wx/ownerdrw.h>
 #endif
 
-//#include  "wx/log.h"
 #include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 
diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h
index e63f6b49a..269540590 100644
--- a/src/BatchProcessDialog.h
+++ b/src/BatchProcessDialog.h
@@ -18,7 +18,6 @@
     #include  <wx/ownerdrw.h>
 #endif
 
-//#include  "wx/log.h"
 #include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 
diff --git a/src/DirManager.h b/src/DirManager.h
index 69dfc61be..022f3e704 100644
--- a/src/DirManager.h
+++ b/src/DirManager.h
@@ -12,7 +12,6 @@
 #define _DIRMANAGER_
 
 #include "MemoryX.h"
-#include <wx/utils.h>
 
 #include "audacity/Types.h"
 #include "xml/XMLTagHandler.h"
diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp
index 1f11fa310..2af057827 100644
--- a/src/FFmpeg.cpp
+++ b/src/FFmpeg.cpp
@@ -29,6 +29,7 @@ License: GPL v2.  See License.txt.
 #include <wx/dynlib.h>
 #include <wx/file.h>
 #include <wx/filedlg.h>
+#include <wx/log.h>
 
 #if !defined(USE_FFMPEG)
 /// FFmpeg support may or may not be compiled in,
diff --git a/src/FFmpeg.h b/src/FFmpeg.h
index 56d234fda..b6384969e 100644
--- a/src/FFmpeg.h
+++ b/src/FFmpeg.h
@@ -150,8 +150,6 @@ extern "C" {
 
 /* rather earlier than normal, but pulls in config*.h and other program stuff
  * we need for the next bit */
-#include <wx/log.h>      // for wxLogNull
-#include <wx/utils.h>
 #include "widgets/LinkingHtmlWindow.h"
 #include "ShuttleGui.h"
 #include "Prefs.h"
diff --git a/src/FileFormats.h b/src/FileFormats.h
index 820d36839..fe3c3e0da 100644
--- a/src/FileFormats.h
+++ b/src/FileFormats.h
@@ -17,6 +17,8 @@
 
 #include "sndfile.h"
 
+class wxString;
+
 //
 // enumerating headers
 //
diff --git a/src/FreqWindow.h b/src/FreqWindow.h
index d054b2eff..29cf16bbe 100644
--- a/src/FreqWindow.h
+++ b/src/FreqWindow.h
@@ -19,7 +19,6 @@
 #include <wx/gdicmn.h>
 #include <wx/font.h> // member variable
 #include <wx/statusbr.h> // to inherit
-#include <wx/utils.h>
 #include "SampleFormat.h"
 #include "widgets/wxPanelWrapper.h"
 
diff --git a/src/HistoryWindow.h b/src/HistoryWindow.h
index c20c9bbfd..36257dd2c 100644
--- a/src/HistoryWindow.h
+++ b/src/HistoryWindow.h
@@ -11,11 +11,11 @@
 #ifndef __AUDACITY_HISTORY_WINDOW__
 #define __AUDACITY_HISTORY_WINDOW__
 
-#include <wx/listctrl.h>
-
 #include "widgets/wxPanelWrapper.h"
 
 class wxButton;
+class wxListCtrl;
+class wxListEvent;
 class wxSpinCtrl;
 class wxTextCtrl;
 class AudacityProject;
diff --git a/src/MixerBoard.h b/src/MixerBoard.h
index e82d7684a..a094a31d3 100644
--- a/src/MixerBoard.h
+++ b/src/MixerBoard.h
@@ -15,7 +15,6 @@
 #define __AUDACITY_MIXER_BOARD__
 
 #include <wx/frame.h> // to inherit
-#include <wx/image.h>
 #include <wx/scrolwin.h>
 
 #include "widgets/ASlider.h"
@@ -24,6 +23,7 @@
 
 class wxArrayString;
 class wxBitmapButton;
+class wxImage;
 class wxMemoryDC;
 class AButton;
 struct TrackListEvent;
diff --git a/src/Project.h b/src/Project.h
index 71b2be9cf..0ae8c8b69 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -35,7 +35,6 @@
 
 #include <memory>
 #include <wx/defs.h>
-#include <wx/log.h>
 
 // dragimgg.h uses this incomplete type without declaring it on some OSs !
 class wxMemoryDC;
diff --git a/src/Theme.h b/src/Theme.h
index 7ee7dacc6..42de50d97 100644
--- a/src/Theme.h
+++ b/src/Theme.h
@@ -19,12 +19,12 @@
 #include <vector>
 #include <wx/bitmap.h>
 #include <wx/defs.h>
-#include <wx/image.h>
 #include <wx/window.h> // to inherit
 
 class wxArrayString;
 class wxColour;
 class wxFont;
+class wxImage;
 class wxPen;
 
 // JKC: will probably change name from 'teBmps' to 'tIndexBmp';
diff --git a/src/effects/EffectRack.h b/src/effects/EffectRack.h
index d1f973301..6caaca036 100644
--- a/src/effects/EffectRack.h
+++ b/src/effects/EffectRack.h
@@ -20,7 +20,6 @@
 
 #include <wx/defs.h>
 #include <wx/frame.h> // to inherit
-#include <wx/image.h>
 #include <wx/panel.h>
 #include <wx/timer.h>
 
diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h
index dbc8d9d98..ceb3c724a 100644
--- a/src/effects/Equalization.h
+++ b/src/effects/Equalization.h
@@ -21,7 +21,6 @@
 #include <wx/panel.h>
 #include <wx/dialog.h>
 #include <wx/intl.h>
-#include <wx/listctrl.h>
 #include <wx/bitmap.h>
 #include <wx/radiobut.h>
 
@@ -53,6 +52,8 @@ class wxBoxSizer;
 class wxButton;
 class wxCheckBox;
 class wxChoice;
+class wxListCtrl;
+class wxListEvent;
 class wxSizer;
 class wxSizerItem;
 class wxSlider;
diff --git a/src/export/ExportMultiple.h b/src/export/ExportMultiple.h
index e331c95d7..2b5fba317 100644
--- a/src/export/ExportMultiple.h
+++ b/src/export/ExportMultiple.h
@@ -12,7 +12,6 @@
 #define __AUDACITY_EXPORT_MULTIPLE__
 
 #include <wx/dialog.h>
-#include <wx/listctrl.h>
 
 #include "Export.h"
 #include "../Tags.h"       // we need to know about the Tags class for metadata
@@ -21,6 +20,7 @@
 class wxButton;
 class wxCheckBox;
 class wxChoice;
+class wxListEvent;
 class wxRadioButton;
 class wxSimplebook;
 class wxStaticText;
diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h
index 328f8943b..c1a8c9e64 100644
--- a/src/prefs/KeyConfigPrefs.h
+++ b/src/prefs/KeyConfigPrefs.h
@@ -17,7 +17,6 @@ class ShuttleGui;
 
 #include <wx/defs.h>
 #include <wx/imaglist.h>
-#include <wx/listctrl.h>
 #include <wx/radiobut.h>
 #include <wx/srchctrl.h>
 #include <wx/timer.h>
diff --git a/src/prefs/MousePrefs.h b/src/prefs/MousePrefs.h
index 155d70fcf..7209475a3 100644
--- a/src/prefs/MousePrefs.h
+++ b/src/prefs/MousePrefs.h
@@ -11,10 +11,9 @@
 
 #include <wx/defs.h>
 
-#include <wx/listctrl.h>
-
 #include "PrefsPanel.h"
 
+class wxListCtrl;
 class ShuttleGui;
 
 class MousePrefs final : public PrefsPanel
diff --git a/src/toolbars/DeviceToolBar.h b/src/toolbars/DeviceToolBar.h
index b11e437d6..71c38c5ee 100644
--- a/src/toolbars/DeviceToolBar.h
+++ b/src/toolbars/DeviceToolBar.h
@@ -15,7 +15,6 @@
 #include <vector>
 #include "ToolBar.h"
 
-class wxImage;
 class wxSize;
 class wxPoint;
 class wxChoice;
diff --git a/src/toolbars/MixerToolBar.h b/src/toolbars/MixerToolBar.h
index 5c8aa42f9..215657f64 100644
--- a/src/toolbars/MixerToolBar.h
+++ b/src/toolbars/MixerToolBar.h
@@ -14,7 +14,6 @@
 #include "../MemoryX.h"
 #include "ToolBar.h"
 
-class wxImage;
 class wxSize;
 class wxPoint;
 
diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h
index 2a8a020d5..58c9e7501 100644
--- a/src/widgets/AButton.h
+++ b/src/widgets/AButton.h
@@ -21,10 +21,10 @@
 #include "WindowAccessible.h"
 #endif
 
-#include <wx/image.h>
-
 #include "ImageRoll.h"
 
+class wxImage;
+
 class AButton final : public wxWindow {
    friend class AButtonAx;
    class Listener;
diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h
index 4272f7743..a51be785b 100644
--- a/src/widgets/ASlider.h
+++ b/src/widgets/ASlider.h
@@ -27,7 +27,6 @@
 class wxArrayString;
 class wxBitmap;
 class wxCursor;
-class wxImage;
 class wxSize;
 class wxPoint;
 class wxTextCtrl;
diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h
index 45a279204..47d6b4e05 100644
--- a/src/widgets/ProgressDialog.h
+++ b/src/widgets/ProgressDialog.h
@@ -25,7 +25,6 @@
 #include <wx/defs.h>
 #include <wx/evtloop.h>
 #include <wx/gauge.h>
-#include <wx/utils.h>
 
 #include "wxPanelWrapper.h"