Remove wx/{log.h, image.h, listctrl.h, utils.h} from headers

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>
 

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;

src/BatchCommandDialog.h

@@ -18,7 +18,6 @@
     #include  <wx/ownerdrw.h>
 #endif
 
-//#include  "wx/log.h"
 #include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 

src/BatchProcessDialog.h

@@ -18,7 +18,6 @@
     #include  <wx/ownerdrw.h>
 #endif
 
-//#include  "wx/log.h"
 #include  <wx/menuitem.h>
 #include  <wx/checklst.h>
 

src/DirManager.h

@@ -12,7 +12,6 @@
 #define _DIRMANAGER_
 
 #include "MemoryX.h"
-#include <wx/utils.h>
 
 #include "audacity/Types.h"
 #include "xml/XMLTagHandler.h"

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,

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"

src/FileFormats.h

@@ -17,6 +17,8 @@
 
 #include "sndfile.h"
 
+class wxString;
+
 //
 // enumerating headers
 //

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"
 

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;

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;

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;

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';

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>
 

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;

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;

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>

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

src/toolbars/DeviceToolBar.h

@@ -15,7 +15,6 @@
 #include <vector>
 #include "ToolBar.h"
 
-class wxImage;
 class wxSize;
 class wxPoint;
 class wxChoice;

src/toolbars/MixerToolBar.h

@@ -14,7 +14,6 @@
 #include "../MemoryX.h"
 #include "ToolBar.h"
 
-class wxImage;
 class wxSize;
 class wxPoint;
 

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;

src/widgets/ASlider.h

@@ -27,7 +27,6 @@
 class wxArrayString;
 class wxBitmap;
 class wxCursor;
-class wxImage;
 class wxSize;
 class wxPoint;
 class wxTextCtrl;

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"