Remove wx/wx.h from headers

src/DeviceManager.h

@@ -22,7 +22,8 @@
 
 #include <chrono>
 #include <vector>
-#include <wx/wx.h>
+
+#include <wx/string.h> // member variables
 
 #if defined(EXPERIMENTAL_DEVICE_CHANGE_HANDLER)
 #include "DeviceChange.h"

src/PitchName.h

@@ -18,7 +18,7 @@
 #ifndef __AUDACITY_PITCHNAME__
 #define __AUDACITY_PITCHNAME__
 
-#include <wx/wx.h>
+class wxString;
 
 // FreqToMIDInote takes a frequency in Hz (exponential scale relative to
 // alphabetic pitch names) and returns a pitch ID number (linear

src/Theme.h

@@ -17,12 +17,12 @@
 #include "Audacity.h"
 
 #include <vector>
-#include <wx/wx.h>
 #include <wx/bitmap.h>
 #include <wx/colour.h>
 #include <wx/defs.h>
 #include <wx/font.h>
 #include <wx/image.h>
+#include <wx/window.h> // to inherit
 
 // JKC: will probably change name from 'teBmps' to 'tIndexBmp';
 typedef int teBmps; /// The index of a bitmap resource in Theme Resources.

src/effects/Effect.cpp

@@ -28,9 +28,12 @@ greater use in future.
 
 #include <algorithm>
 
+#include <wx/checkbox.h>
+#include <wx/dcmemory.h>
 #include <wx/defs.h>
 #include <wx/hashmap.h>
 #include <wx/menu.h>
+#include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/stockitem.h>
 #include <wx/string.h>

src/effects/VST/VSTEffect.h

@@ -12,8 +12,6 @@
 
 #if USE_VST
 
-#include <wx/wx.h>
-
 #include "audacity/EffectInterface.h"
 #include "audacity/ModuleInterface.h"
 #include "audacity/PluginInterface.h"
@@ -22,6 +20,9 @@
 #include "../../widgets/NumericTextCtrl.h"
 #include "../../xml/XMLTagHandler.h"
 
+class wxSizerItem;
+class wxSlider;
+
 class VSTControl;
 #include "VSTControl.h"
 

src/ondemand/ODDecodeFlacTask.cpp

@@ -15,6 +15,7 @@
 #include <wx/utils.h>
 #include <wx/file.h>
 #include <wx/ffile.h>
+#include <wx/wx.h>
 
 #ifdef USE_LIBID3TAG
 extern "C" {

src/ondemand/ODManager.h

@@ -21,8 +21,8 @@ number of threads.
 
 #include <vector>
 #include "ODTaskThread.h"
+#include <wx/event.h> // for DECLARE_EXPORTED_EVENT_TYPE
 #include <wx/thread.h>
-#include <wx/wx.h>
 
 #ifdef __WXMAC__
 // On Mac OS X, it's better not to use the wxThread class.

src/ondemand/ODTask.h

@@ -28,7 +28,6 @@ in a background thread.
 
 #include "../MemoryX.h"
 #include <vector>
-#include <wx/wx.h>
 class AudacityProject;
 class Track;
 class WaveTrack;

src/ondemand/ODWaveTrackTaskQueue.h

@@ -25,7 +25,6 @@ tasks associated with a WaveTrack.
 #include "../MemoryX.h"
 #include <vector>
 #include "ODTaskThread.h"
-#include <wx/wx.h>
 class Track;
 class WaveTrack;
 class ODTask;

src/widgets/Ruler.cpp

@@ -57,6 +57,9 @@ array of Ruler::Label.
 #include "../Audacity.h"
 #include "Ruler.h"
 
+#include <wx/dcclient.h>
+#include <wx/dcscreen.h>
+
 #include "../Experimental.h"
 
 #include "../AColor.h"