Remove wx/filename.h, wx/choice.h, wxFileNameWrapper.h from headers

src/BatchCommandDialog.h

@@ -27,7 +27,6 @@
 
 class wxWindow;
 class wxCheckBox;
-class wxChoice;
 class wxTextCtrl;
 class wxRadioButton;
 class wxListCtrl;

src/BatchProcessDialog.h

@@ -27,7 +27,6 @@
 
 class wxWindow;
 class wxCheckBox;
-class wxChoice;
 class wxTextCtrl;
 class wxRadioButton;
 class wxListCtrl;

src/BlockFile.h

@@ -14,14 +14,13 @@
 
 #include "MemoryX.h"
 #include <wx/ffile.h>
-#include <wx/filename.h>
 
 #include "xml/XMLTagHandler.h"
 #include "xml/XMLWriter.h"
 
 #include "SampleFormat.h"
 
-#include "wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h" // member variable below
 
 #include "ondemand/ODTaskThread.h"
 

src/Dependencies.h

@@ -15,9 +15,8 @@
 #define __AUDACITY_DEPENDENCIES__
 
 #include <list>
-#include <wx/filename.h>
 #include "MemoryX.h"
-#include "wxFileNameWrapper.h"
+#include "wxFileNameWrapper.h" // member variable below
 
 class AudacityProject;
 

src/DirManager.h

@@ -13,16 +13,15 @@
 
 #include "MemoryX.h"
 #include <wx/list.h>
-#include <wx/filename.h>
 #include <wx/hashmap.h>
 #include <wx/utils.h>
 
 #include "audacity/Types.h"
 #include "xml/XMLTagHandler.h"
-#include "wxFileNameWrapper.h"
 
 #include <unordered_map>
 
+class wxFileNameWrapper;
 class wxHashTable;
 class BlockArray;
 class BlockFile;

src/FileException.h

@@ -10,7 +10,7 @@
 #define __AUDACITY_FILE_EXCEPTION__
 
 #include "AudacityException.h"
-#include <wx/filename.h>
+#include <wx/filename.h> // wxFileName member variable below
 
 class FileException /* not final */ : public MessageBoxException
 {

src/Tags.h

@@ -45,7 +45,6 @@
 
 class wxArrayString;
 class wxButton;
-class wxChoice;
 class wxComboBox;
 class wxGridCellChoiceEditor;
 class wxRadioButton;

src/TimerRecordDialog.cpp

@@ -25,6 +25,7 @@
 
 #include <wx/setup.h> // for wxUSE_* macros
 
+#include <wx/choice.h>
 #include <wx/defs.h>
 #include <wx/dir.h>
 #include <wx/datetime.h>

src/blockfile/LegacyBlockFile.h

@@ -11,10 +11,10 @@
 #ifndef __AUDACITY_LEGACY_BLOCKFILE__
 #define __AUDACITY_LEGACY_BLOCKFILE__
 
-#include <wx/filename.h>
-
 #include "../BlockFile.h"
 
+class wxFileName;
+
 void ComputeLegacySummaryInfo(const wxFileName &fileName,
                               size_t summaryLen,
                               sampleFormat format,

src/blockfile/NotYetAvailableException.h

@@ -10,7 +10,6 @@
 #define __AUDACITY_NOT_YET_AVAILABLE_EXCEPTION__
 
 #include "../FileException.h"
-#include <wx/filename.h>
 
 // This exception can be thrown when attempting read of on-demand block files
 // that have not yet completed loading.

src/blockfile/SilentBlockFile.h

@@ -14,8 +14,6 @@
 #ifndef __AUDACITY_SILENT_BLOCKFILE__
 #define __AUDACITY_SILENT_BLOCKFILE__
 
-#include <wx/filename.h>
-
 #include "../BlockFile.h"
 #include "../DirManager.h"
 

src/blockfile/SimpleBlockFile.h

@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_SIMPLE_BLOCKFILE__
 #define __AUDACITY_SIMPLE_BLOCKFILE__
 
-#include <wx/filename.h>
-
 #include "../BlockFile.h"
 #include "../DirManager.h"
 #include "../xml/XMLWriter.h"

src/commands/AudacityCommand.h

@@ -24,7 +24,6 @@
 #include <wx/tglbtn.h>
 
 class wxCheckBox;
-class wxChoice;
 class wxListBox;
 class wxWindow;
 

src/effects/ChangePitch.cpp

@@ -27,6 +27,7 @@ the pitch without changing the tempo.
 #include <float.h>
 #include <math.h>
 
+#include <wx/choice.h>
 #include <wx/intl.h>
 #include <wx/slider.h>
 #include <wx/valtext.h>

src/effects/ChangePitch.h

@@ -26,12 +26,12 @@ the pitch without changing the tempo.
 #include <wx/checkbox.h>
 #endif
 
-#include <wx/choice.h>
 #include <wx/spinctrl.h>
 
 #include "SoundTouchEffect.h"
 
 class wxSlider;
+class wxChoice;
 class wxTextCtrl;
 class ShuttleGui;
 

src/effects/ChangeSpeed.cpp

@@ -18,6 +18,7 @@
 
 #include <math.h>
 
+#include <wx/choice.h>
 #include <wx/intl.h>
 #include <wx/slider.h>
 

src/effects/ChangeSpeed.h

@@ -13,13 +13,12 @@
 #ifndef __AUDACITY_EFFECT_CHANGESPEED__
 #define __AUDACITY_EFFECT_CHANGESPEED__
 
-#include <wx/choice.h>
-
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"
 
 class wxSlider;
+class wxChoice;
 class wxTextCtrl;
 class ShuttleGui;
 

src/effects/Effect.cpp

@@ -29,6 +29,7 @@ greater use in future.
 #include <algorithm>
 
 #include <wx/checkbox.h>
+#include <wx/choice.h>
 #include <wx/dcmemory.h>
 #include <wx/defs.h>
 #include <wx/hashmap.h>

src/effects/EffectManager.h

@@ -15,7 +15,6 @@
 #include "../Experimental.h"
 
 #include <vector>
-#include <wx/choice.h>
 #include <wx/dialog.h>
 #include <wx/listbox.h>
 

src/effects/Equalization.h

@@ -25,7 +25,6 @@
 #include <wx/listctrl.h>
 #include <wx/sizer.h>
 #include <wx/bitmap.h>
-#include <wx/choice.h>
 #include <wx/radiobut.h>
 #include <wx/checkbox.h>
 
@@ -54,6 +53,7 @@ const int kEqOptionCurve   =1<<1;
 // The legacy version offers both Graphic and curve on the same UI.
 const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
 
+class wxChoice;
 class wxSlider;
 class wxStaticText;
 class Envelope;

src/effects/ScienFilter.cpp

@@ -41,6 +41,7 @@ a graph for EffectScienFilter.
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include <wx/brush.h>
+#include <wx/choice.h>
 #include <wx/dcmemory.h>
 #include <wx/intl.h>
 #include <wx/settings.h>

src/effects/ScienFilter.h

@@ -16,13 +16,13 @@ Vaughan Johnson (Preview)
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include <wx/bitmap.h>
-#include <wx/choice.h>
 #include <wx/panel.h>
 
 #include "Biquad.h"
 
 #include "Effect.h"
 
+class wxChoice;
 class wxSlider;
 class wxStaticText;
 class wxTextCtrl;

src/effects/nyquist/Nyquist.cpp

@@ -67,6 +67,7 @@ effects from this one class.
 #include "../../widgets/valnum.h"
 #include "../../widgets/ErrorDialog.h"
 #include "../../Prefs.h"
+#include "../../wxFileNameWrapper.h"
 #include "../../prefs/WaveformSettings.h"
 #include "../../widgets/NumericTextCtrl.h"
 

src/effects/nyquist/Nyquist.h

@@ -14,7 +14,6 @@
 #include <wx/button.h>
 #include <wx/datetime.h>
 #include <wx/dialog.h>
-#include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/sizer.h>
 #include <wx/textbuf.h>
@@ -25,6 +24,7 @@
 #include "nyx.h"
 
 class wxArrayString;
+class wxFileName;
 class wxTextCtrl;
 
 #define NYQUISTEFFECTS_VERSION wxT("1.0.0.0")

src/effects/vamp/VampEffect.h

@@ -16,7 +16,6 @@
 #if defined(USE_VAMP)
 
 #include <wx/checkbox.h>
-#include <wx/choice.h>
 
 #include <vamp-hostsdk/PluginLoader.h>
 
@@ -25,6 +24,7 @@
 
 class wxStaticText;
 class wxSlider;
+class wxChoice;
 class wxTextCtrl;
 class LabelTrack;
 

src/export/Export.h

@@ -14,13 +14,13 @@
 #include "../MemoryX.h"
 #include <vector>
 #include <wx/dialog.h>
-#include <wx/filename.h>
 #include <wx/simplebook.h>
 #include "../Tags.h"
 #include "../SampleFormat.h"
 #include "../widgets/wxPanelWrapper.h"
 
 class wxArrayString;
+class wxFileName;
 class FileDialogWrapper;
 class wxFileCtrlEvent;
 class wxMemoryDC;

src/export/ExportMultiple.h

@@ -17,7 +17,7 @@
 
 #include "Export.h"
 #include "../Tags.h"       // we need to know about the Tags class for metadata
-#include "../wxFileNameWrapper.h"
+#include "../wxFileNameWrapper.h" // member variable below
 
 class wxButton;
 class wxCheckBox;

src/import/ImportPlugin.h

@@ -59,7 +59,6 @@ but little else.
 
 #include "audacity/Types.h"
 #include "../Internat.h"
-#include <wx/filename.h>
 #include "../MemoryX.h"
 
 #include "../widgets/ProgressDialog.h"

src/prefs/DevicePrefs.h

@@ -14,10 +14,9 @@
 
 #include <wx/defs.h>
 
-#include <wx/choice.h>
-
 #include "PrefsPanel.h"
 
+class wxChoice;
 class ShuttleGui;
 class wxArrayStringEx;
 

src/prefs/MidiIOPrefs.h

@@ -11,6 +11,7 @@
 
 #include "../Experimental.h"
 
+class wxChoice;
 class wxTextCtrl;
 class ShuttleGui;
 
@@ -21,8 +22,6 @@ class ShuttleGui;
 
 #include <wx/defs.h>
 
-#include <wx/choice.h>
-
 #include "PrefsPanel.h"
 
 class wxArrayStringEx;

src/prefs/QualityPrefs.cpp

@@ -18,6 +18,7 @@
 #include "../Audacity.h"
 #include "QualityPrefs.h"
 
+#include <wx/choice.h>
 #include <wx/defs.h>
 
 #include "../AudioIO.h"

src/prefs/QualityPrefs.h

@@ -15,10 +15,9 @@
 #include <vector>
 #include <wx/defs.h>
 
-#include <wx/choice.h>
-
 #include "PrefsPanel.h"
 
+class wxChoice;
 class wxTextCtrl;
 class ShuttleGui;
 enum sampleFormat : unsigned;

src/toolbars/MixerToolBar.h

@@ -17,7 +17,6 @@
 class wxImage;
 class wxSize;
 class wxPoint;
-class wxChoice;
 class wxStaticBitmap;
 
 class ASlider;

src/widgets/FileHistory.h

@@ -14,7 +14,6 @@
 #include <vector>
 #include <algorithm>
 #include <wx/defs.h>
-#include <wx/choice.h>
 #include <wx/grid.h>
 #include <wx/weakref.h>
 

src/widgets/Grid.h

@@ -15,7 +15,6 @@
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/choice.h>
 #include <wx/grid.h>
 #include "NumericTextCtrl.h"
 #include "../Internat.h"
@@ -29,6 +28,7 @@ class GridAx;
 #endif
 
 class wxArrayString;
+class wxChoice;
 class NumericTextCtrl;
 
 /**********************************************************************//**

src/wxFileNameWrapper.h

@@ -13,6 +13,8 @@ Paul Licameli
 
 class wxArrayString;
 
+#include <wx/filename.h> // to inherit
+
 // The wxFileName does not have a move constructor.
 // So add one to it, so that it passes around by value more quickly.
 class wxFileNameWrapper : public wxFileName