Remove NumericTextCtrl.h from other headers or comment why you can't

src/Snap.h

@@ -17,7 +17,7 @@
 
 #include <vector>
 #include <wx/defs.h>
-#include "widgets/NumericTextCtrl.h"
+#include "widgets/NumericTextCtrl.h" // member variable
 
 class AudacityProject;
 class Track;

src/TimeDialog.cpp

@@ -22,6 +22,7 @@
 #include <wx/string.h>
 
 #include "ShuttleGui.h"
+#include "widgets/NumericTextCtrl.h"
 
 BEGIN_EVENT_TABLE(TimeDialog, wxDialogWrapper)
    EVT_COMMAND(wxID_ANY, EVT_TIMETEXTCTRL_UPDATED, TimeDialog::OnUpdate)

src/TimeDialog.h

@@ -13,7 +13,8 @@
 
 #include <wx/defs.h>
 
-#include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol
+#include "audacity/ComponentInterface.h" // member variable
+
 #include "widgets/wxPanelWrapper.h" // to inherit
 
 class NumericTextCtrl;

src/effects/ChangeSpeed.cpp

@@ -28,6 +28,7 @@
 #include "../Resample.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
+#include "../widgets/NumericTextCtrl.h"
 #include "../widgets/valnum.h"
 
 #include "TimeWarper.h"

src/effects/ChangeSpeed.h

@@ -13,13 +13,12 @@
 #ifndef __AUDACITY_EFFECT_CHANGESPEED__
 #define __AUDACITY_EFFECT_CHANGESPEED__
 
-#include "../widgets/NumericTextCtrl.h"
-
 #include "Effect.h"
 
 class wxSlider;
 class wxChoice;
 class wxTextCtrl;
+class NumericTextCtrl;
 class ShuttleGui;
 
 #define CHANGESPEED_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Change Speed") }

src/effects/DtmfGen.cpp

@@ -27,6 +27,7 @@
 #include "../Prefs.h"
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
+#include "../widgets/NumericTextCtrl.h"
 #include "../widgets/valnum.h"
 
 

src/effects/DtmfGen.h

@@ -14,13 +14,12 @@
 #ifndef __AUDACITY_EFFECT_DTMF__
 #define __AUDACITY_EFFECT_DTMF__
 
-#include "../widgets/NumericTextCtrl.h"
-
 #include "Effect.h"
 
 class wxSlider;
 class wxStaticText;
 class wxTextCtrl;
+class NumericTextCtrl;
 class ShuttleGui;
 
 #define DTMFTONES_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("DTMF Tones") }

src/effects/Noise.cpp

@@ -27,6 +27,7 @@
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
+#include "../widgets/NumericTextCtrl.h"
 
 enum kTypes
 {

src/effects/Noise.h

@@ -13,10 +13,9 @@
 #ifndef __AUDACITY_EFFECT_NOISE__
 #define __AUDACITY_EFFECT_NOISE__
 
-#include "../widgets/NumericTextCtrl.h"
-
 #include "Effect.h"
 
+class NumericTextCtrl;
 class ShuttleGui;
 
 #define NOISE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Noise") }

src/effects/Silence.cpp

@@ -20,6 +20,7 @@
 
 #include "../ShuttleGui.h"
 #include "../WaveTrack.h"
+#include "../widgets/NumericTextCtrl.h"
 
 EffectSilence::EffectSilence()
 {

src/effects/Silence.h

@@ -13,10 +13,10 @@
 #ifndef __AUDACITY_EFFECT_SILENCE__
 #define __AUDACITY_EFFECT_SILENCE__
 
-#include "../widgets/NumericTextCtrl.h"
-
 #include "Generator.h"
 
+class NumericTextCtrl;
+
 #define SILENCE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Silence") }
 
 class EffectSilence final : public Generator

src/effects/ToneGen.cpp

@@ -32,6 +32,7 @@ frequency changes smoothly during the tone.
 #include "../Shuttle.h"
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
+#include "../widgets/NumericTextCtrl.h"
 
 enum kInterpolations
 {

src/effects/ToneGen.h

@@ -13,10 +13,9 @@
 #ifndef __AUDACITY_EFFECT_TONEGEN__
 #define __AUDACITY_EFFECT_TONEGEN__
 
-#include "../widgets/NumericTextCtrl.h"
-
 #include "Effect.h"
 
+class NumericTextCtrl;
 class ShuttleGui;
 
 #define CHIRP_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Chirp") }

src/effects/VST/VSTEffect.cpp

@@ -86,6 +86,7 @@
 #include "../../effects/Effect.h"
 #include "../../widgets/valnum.h"
 #include "../../widgets/ErrorDialog.h"
+#include "../../widgets/NumericTextCtrl.h"
 #include "../../xml/XMLFileReader.h"
 
 #if wxUSE_ACCESSIBILITY

src/effects/VST/VSTEffect.h

@@ -17,13 +17,14 @@
 #include "audacity/PluginInterface.h"
 
 #include "../../SampleFormat.h"
-#include "../../widgets/NumericTextCtrl.h"
 #include "../../xml/XMLTagHandler.h"
 
 class wxSizerItem;
 class wxSlider;
 class wxStaticText;
 
+class NumericTextCtrl;
+
 class VSTControl;
 #include "VSTControl.h"
 

src/effects/ladspa/LadspaEffect.cpp

@@ -48,6 +48,7 @@ effects from this one class.
 
 #include "../../FileNames.h"
 #include "../../ShuttleGui.h"
+#include "../../widgets/NumericTextCtrl.h"
 #include "../../widgets/valnum.h"
 #include "../../widgets/wxPanelWrapper.h"
 

src/effects/ladspa/LadspaEffect.h

@@ -13,14 +13,15 @@ class wxStaticText;
 class wxTextCtrl;
 class wxCheckBox;
 
+class NumericTextCtrl;
+
 #include <wx/dynlib.h> // member variable
+#include <wx/event.h> // to inherit
 
 #include "audacity/EffectInterface.h"
 #include "audacity/ModuleInterface.h"
 #include "audacity/PluginInterface.h"
 
-#include "../../widgets/NumericTextCtrl.h"
-
 #include "ladspa.h"
 #include "../../SampleFormat.h"
 

src/effects/lv2/LV2Effect.cpp

@@ -37,6 +37,7 @@
 #include "../../ShuttleGui.h"
 #include "../../widgets/valnum.h"
 #include "../../widgets/ErrorDialog.h"
+#include "../../widgets/NumericTextCtrl.h"
 
 #include "lilv/lilv.h"
 #include "suil/suil.h"

src/effects/lv2/LV2Effect.h

@@ -17,6 +17,8 @@ class wxArrayString;
 
 #include <vector>
 
+#include <wx/event.h> // to inherit
+
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"
 #include "lv2/lv2plug.in/ns/ext/data-access/data-access.h"
 #include "lv2/lv2plug.in/ns/ext/options/options.h"
@@ -28,7 +30,6 @@ class wxArrayString;
 #include <suil/suil.h>
 
 #include "../../SampleFormat.h"
-#include "../../widgets/NumericTextCtrl.h"
 
 #include "LoadLV2.h"
 
@@ -37,6 +38,8 @@ class wxArrayString;
 class wxSlider;
 class wxTextCtrl;
 
+class NumericTextCtrl;
+
 #define LV2EFFECTS_VERSION wxT("1.0.0.0")
 /* i18n-hint: abbreviates
    "Linux Audio Developer's Simple Plugin API (LADSPA) version 2" */

src/toolbars/SpectralSelectionBar.cpp

@@ -61,6 +61,8 @@ with changes in the SpectralSelectionBar.
 #include "../widgets/WindowAccessible.h"
 #endif
 
+#include "../widgets/NumericTextCtrl.h"
+
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
 
 IMPLEMENT_CLASS(SpectralSelectionBar, ToolBar);

src/toolbars/SpectralSelectionBar.h

@@ -14,7 +14,6 @@ Paul Licameli
 #include <wx/defs.h>
 
 #include "ToolBar.h"
-#include "../widgets/NumericTextCtrl.h"
 
 class wxChoice;
 class wxComboBox;

src/widgets/Grid.h

@@ -15,7 +15,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/grid.h> // to inherit wxGridCellEditor
-#include "NumericTextCtrl.h"
+#include "NumericTextCtrl.h" // for NumericConverter::Type
 
 #if wxUSE_ACCESSIBILITY
 class GridAx;