Remove wx/string.h from headers

include/audacity/Types.h

@@ -43,7 +43,6 @@
 #define __AUDACITY_TYPES_H__
 
 #include <algorithm>
-#include <wx/string.h>
 #include <wx/arrstr.h>
 #include <type_traits>
 #include <vector>

src/AudacityLogger.h

@@ -23,7 +23,6 @@
 #include <wx/log.h>
 #include <wx/frame.h>
 #include <wx/textctrl.h>
-#include <wx/string.h>
 
 class AudacityLogger final : public wxEvtHandler, public wxLog {
  public:

src/AudioIO.h

@@ -49,7 +49,6 @@ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
 #endif
 
 #include <wx/event.h>
-#include <wx/string.h>
 #include <wx/thread.h>
 
 #include "SampleFormat.h"

src/AudioIOListener.h

@@ -13,8 +13,6 @@
 #ifndef __AUDACITY_AUDIO_IO_LISTENER__
 #define __AUDACITY_AUDIO_IO_LISTENER__
 
-#include <wx/string.h>
-
 class AutoSaveFile;
 
 class AUDACITY_DLL_API AudioIOListener /* not final */ {

src/BatchCommandDialog.h

@@ -13,8 +13,6 @@
 #define __AUDACITY_MACRO_COMMAND_DIALOG__
 
 #include <wx/defs.h>
-#include <wx/string.h>
-
 
 #ifdef __WXMSW__
     #include  <wx/ownerdrw.h>

src/BatchCommands.h

@@ -13,7 +13,6 @@
 #define __AUDACITY_BATCH_COMMANDS_DIALOG__
 
 #include <wx/defs.h>
-#include <wx/string.h>
 
 #include "export/Export.h"
 

src/BatchProcessDialog.h

@@ -13,8 +13,6 @@
 #define __AUDACITY_MACROS_WINDOW__
 
 #include <wx/defs.h>
-#include <wx/string.h>
-
 
 #ifdef __WXMSW__
     #include  <wx/ownerdrw.h>

src/BlockFile.h

@@ -13,7 +13,6 @@
 #define __AUDACITY_BLOCKFILE__
 
 #include "MemoryX.h"
-#include <wx/string.h>
 #include <wx/ffile.h>
 #include <wx/filename.h>
 

src/DirManager.h

@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <wx/list.h>
-#include <wx/string.h>
 #include <wx/filename.h>
 #include <wx/hashmap.h>
 #include <wx/utils.h>

src/FFmpeg.h

@@ -150,7 +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/string.h>
 #include <wx/dynlib.h>
 #include <wx/log.h>      // for wxLogNull
 #include <wx/utils.h>

src/FileFormats.h

@@ -15,7 +15,6 @@
 
 #include <wx/list.h>
 #include <wx/arrstr.h>
-#include <wx/string.h>
 
 #include "audacity/Types.h"
 

src/HitTestResult.h

@@ -11,7 +11,6 @@ Paul Licameli
 #ifndef __AUDACITY_HIT_TEST_RESULT__
 #define __AUDACITY_HIT_TEST_RESULT__
 
-#include <wx/string.h>
 #include "MemoryX.h"
 
 class wxCursor;

src/Internat.h

@@ -14,7 +14,6 @@
 
 #include "Audacity.h"
 
-#include <wx/string.h>
 #include <wx/longlong.h>
 
 #include <algorithm>

src/LabelDialog.h

@@ -15,7 +15,6 @@
 #include <wx/defs.h>
 #include <wx/event.h>
 #include <wx/grid.h>
-#include <wx/string.h>
 
 #include "Internat.h"
 #include "widgets/Grid.h"

src/LabelTrack.h

@@ -20,7 +20,6 @@
 #include <wx/event.h>
 #include <wx/font.h>
 #include <wx/pen.h>
-#include <wx/string.h>
 #include <wx/clipbrd.h>
 
 

src/LangChoice.h

@@ -15,7 +15,7 @@
 #ifndef __AUDACITY_LANG_CHOICE__
 #define __AUDACITY_LANG_CHOICE__
 
-#include <wx/string.h>
+class wxString;
 
 wxString ChooseLanguage(wxWindow *parent);
 

src/Languages.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_LANGUAGES__
 
 #include <wx/arrstr.h>
-#include <wx/string.h>
 #include <wx/list.h>
 
 void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames);

src/Mix.h

@@ -21,7 +21,6 @@
 #define __AUDACITY_MIX__
 
 #include "MemoryX.h"
-#include <wx/string.h>
 #include "SampleFormat.h"
 #include <vector>
 

src/NoteTrack.h

@@ -16,7 +16,6 @@
 #include "Experimental.h"
 
 #include <utility>
-#include <wx/string.h>
 #include "Track.h"
 #include "effects/TimeWarper.h"
 

src/PlatformCompatibility.h

@@ -20,7 +20,6 @@
 #ifndef __AUDACITY_COMPATIBILITY__
 #define __AUDACITY_COMPATIBILITY__
 
-#include <wx/string.h>
 #include "audacity/Types.h"
 
 class PlatformCompatibility

src/PluginManager.h

@@ -13,7 +13,6 @@
 
 #include <wx/defs.h>
 #include <wx/fileconf.h>
-#include <wx/string.h>
 
 #include "MemoryX.h"
 #include <map>

src/Printing.h

@@ -12,8 +12,8 @@
 #define __AUDACITY_PRINTING__
 
 #include <wx/defs.h>
-#include <wx/string.h>
 
+class wxString;
 class wxWindow;
 class TrackList;
 class TrackPanel;

src/Resample.h

@@ -16,7 +16,6 @@
 
 #include "MemoryX.h"
 #include <wx/intl.h>
-#include <wx/string.h>
 
 #include "SampleFormat.h"
 

src/Sequence.h

@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/string.h>
 
 #include "SampleFormat.h"
 #include "xml/XMLTagHandler.h"

src/ShuttleGui.h

@@ -20,7 +20,6 @@
 #include "MemoryX.h"
 #include <wx/grid.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 
 #include "WrappedType.h"
 

src/Snap.h

@@ -17,7 +17,6 @@
 
 #include <vector>
 #include <wx/defs.h>
-#include <wx/string.h>
 #include "widgets/NumericTextCtrl.h"
 #include "Internat.h"
 

src/Tags.h

@@ -38,7 +38,6 @@
 #include <utility>
 #include <wx/hashmap.h>
 #include <wx/notebook.h>
-#include <wx/string.h>
 
 #include "widgets/wxPanelWrapper.h"
 

src/TimeDialog.h

@@ -13,7 +13,6 @@
 
 #include <wx/defs.h>
 #include <wx/event.h>
-#include <wx/string.h>
 
 #include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol
 #include "widgets/wxPanelWrapper.h"

src/Track.h

@@ -22,7 +22,6 @@
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/longlong.h>
-#include <wx/string.h>
 
 #include "SampleFormat.h"
 #include "tracks/ui/CommonTrackPanelCell.h"

src/UndoManager.h

@@ -52,7 +52,6 @@
 #include "MemoryX.h"
 #include <vector>
 #include <wx/event.h>
-#include <wx/string.h>
 #include "ondemand/ODTaskThread.h"
 #include "SelectedRegion.h"
 

src/blockfile/LegacyBlockFile.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_LEGACY_BLOCKFILE__
 #define __AUDACITY_LEGACY_BLOCKFILE__
 
-#include <wx/string.h>
 #include <wx/filename.h>
 
 #include "../BlockFile.h"

src/blockfile/SilentBlockFile.h

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

src/blockfile/SimpleBlockFile.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_SIMPLE_BLOCKFILE__
 #define __AUDACITY_SIMPLE_BLOCKFILE__
 
-#include <wx/string.h>
 #include <wx/filename.h>
 
 #include "../BlockFile.h"

src/commands/AudacityCommand.h

@@ -21,7 +21,6 @@
 #include <wx/defs.h>
 #include <wx/dynarray.h>
 #include <wx/intl.h>
-#include <wx/string.h>
 #include <wx/tglbtn.h>
 #include <wx/event.h> // for idle event.
 

src/commands/CommandBuilder.h

@@ -17,7 +17,6 @@
 #define __COMMANDBUILDER__
 
 #include "../MemoryX.h"
-#include <wx/string.h>
 
 class OldStyleCommand;
 using OldStyleCommandPointer = std::shared_ptr<OldStyleCommand>;

src/commands/CommandContext.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_COMMAND_CONTEXT__
 #define __AUDACITY_COMMAND_CONTEXT__
 
-#include <wx/string.h>
 #include <wx/event.h>
 #include "audacity/Types.h"
 #include "../MemoryX.h"

src/commands/CommandFunctors.h

@@ -9,7 +9,6 @@
 #ifndef __AUDACITY_COMMAND_FUNCTORS__
 #define __AUDACITY_COMMAND_FUNCTORS__
 
-#include <wx/string.h>
 #include <wx/event.h>
 #include "../MemoryX.h"
 #include "Command.h"

src/commands/CommandManager.h

@@ -22,7 +22,6 @@
 #include "../MemoryX.h"
 #include "Keyboard.h"
 #include <vector>
-#include <wx/string.h>
 #include <wx/hashmap.h>
 
 #include "../xml/XMLTagHandler.h"

src/commands/CommandMisc.h

@@ -17,7 +17,6 @@
 #define __COMMANDMISC__
 
 #include <map>
-#include <wx/string.h>
 #include <wx/variant.h>
 #include "Validators.h"
 class OldStyleCommandType;

src/commands/CommandTargets.h

@@ -57,7 +57,6 @@ and sends it to that message target.
 
 #include "../MemoryX.h"
 #include <vector>
-#include <wx/string.h>
 #include <wx/statusbr.h>
 //#include "../src/Project.h"
 #include "../widgets/ProgressDialog.h"

src/commands/Demo.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_DEMO_COMMAND__
 
 #include <wx/event.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "AudacityCommand.h"

src/commands/Keyboard.h

@@ -14,7 +14,6 @@
 
 #include <wx/defs.h>
 #include <wx/event.h>
-#include <wx/string.h>
 
 struct NormalizedKeyString : private wxString
 {

src/commands/ResponseQueue.h

@@ -37,7 +37,7 @@ force the script thread to wait until a response is available.
 #include <queue>
 #include <string>
 #include <wx/thread.h>
-#include <wx/string.h>
+#include <wx/string.h> // member variable
 
 class wxMutex;
 class wxCondition;

src/effects/Amplify.h

@@ -18,7 +18,6 @@
 #include <wx/checkbox.h>
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"

src/effects/AutoDuck.h

@@ -14,7 +14,6 @@
 #include <wx/bitmap.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/window.h>
 

src/effects/BassTreble.h

@@ -15,7 +15,6 @@
 #include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>
 

src/effects/ChangePitch.h

@@ -30,7 +30,6 @@ the pitch without changing the tempo.
 #include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/spinctrl.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "SoundTouchEffect.h"

src/effects/ChangeSpeed.h

@@ -16,7 +16,6 @@
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "../widgets/NumericTextCtrl.h"

src/effects/ChangeTempo.h

@@ -24,7 +24,6 @@
 
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "SoundTouchEffect.h"

src/effects/ClickRemoval.h

@@ -18,7 +18,6 @@
 
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"

src/effects/Compressor.h

@@ -16,7 +16,6 @@
 #include <wx/event.h>
 #include <wx/gdicmn.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/stattext.h>
 #include <wx/window.h>
 #include "../widgets/wxPanelWrapper.h"

src/effects/Distortion.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_EFFECT_DISTORTION__
 
 #include <wx/arrstr.h>
-#include <wx/string.h>
 #include <wx/slider.h>
 #include <wx/textctrl.h>
 #include <wx/checkbox.h>

src/effects/DtmfGen.h

@@ -17,7 +17,6 @@
 #include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 
 #include "../widgets/NumericTextCtrl.h"
 

src/effects/Echo.h

@@ -13,7 +13,6 @@
 #define __AUDACITY_EFFECT_ECHO__
 
 #include <wx/event.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"

src/effects/Effect.h

@@ -23,7 +23,6 @@
 #include <wx/bmpbuttn.h>
 #include <wx/defs.h>
 #include <wx/intl.h>
-#include <wx/string.h>
 #include <wx/tglbtn.h>
 #include <wx/event.h> // for idle event.
 

src/effects/EffectManager.h

@@ -19,7 +19,6 @@
 #include <wx/dialog.h>
 #include <wx/event.h>
 #include <wx/listbox.h>
-#include <wx/string.h>
 
 #include "audacity/EffectInterface.h"
 #include "Effect.h"

src/effects/Equalization.h

@@ -26,7 +26,6 @@
 #include <wx/stattext.h>
 #include <wx/slider.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 #include <wx/bitmap.h>
 #include <wx/choice.h>
 #include <wx/radiobut.h>

src/effects/Fade.h

@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_EFFECT_FADE__
 #define __AUDACITY_EFFECT_FADE__
 
-#include <wx/string.h>
-
 #include "Effect.h"
 
 #define FADEIN_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Fade In") }

src/effects/FindClipping.h

@@ -16,8 +16,6 @@ class wxString;
 
 class LabelTrack;
 
-#include <wx/string.h>
-
 #include "Effect.h"
 
 #define FINDCLIPPING_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Find Clipping") }

src/effects/Invert.h

@@ -13,8 +13,6 @@
 #ifndef __AUDACITY_EFFECT_INVERT__
 #define __AUDACITY_EFFECT_INVERT__
 
-#include <wx/string.h>
-
 #include "Effect.h"
 
 #define INVERT_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Invert") }

src/effects/Noise.h

@@ -13,8 +13,6 @@
 #ifndef __AUDACITY_EFFECT_NOISE__
 #define __AUDACITY_EFFECT_NOISE__
 
-#include <wx/string.h>
-
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Effect.h"

src/effects/Normalize.h

@@ -18,7 +18,6 @@
 #include <wx/checkbox.h>
 #include <wx/event.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"

src/effects/Paulstretch.h

@@ -10,8 +10,6 @@
 #ifndef __AUDACITY_EFFECT_PAULSTRETCH__
 #define __AUDACITY_EFFECT_PAULSTRETCH__
 
-#include <wx/string.h>
-
 #include "Effect.h"
 
 class ShuttleGui;

src/effects/Phaser.h

@@ -18,7 +18,6 @@
 
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"

src/effects/Repair.h

@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_EFFECT_REPAIR__
 #define __AUDACITY_EFFECT_REPAIR__
 
-#include <wx/string.h>
-
 #include "Effect.h"
 
 #define REPAIR_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Repair") }

src/effects/Repeat.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_EFFECT_REPEAT__
 
 #include <wx/event.h>
-#include <wx/string.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 

src/effects/Reverb.h

@@ -16,7 +16,6 @@
 #include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/spinctrl.h>
-#include <wx/string.h>
 
 #include "Effect.h"
 

src/effects/Reverse.h

@@ -13,8 +13,6 @@
 #ifndef __AUDACITY_EFFECT_REVERSE__
 #define __AUDACITY_EFFECT_REVERSE__
 
-#include <wx/string.h>
-
 #include "Effect.h"
 
 #define REVERSE_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Reverse") }

src/effects/ScienFilter.h

@@ -22,7 +22,6 @@ Vaughan Johnson (Preview)
 #include <wx/panel.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/window.h>
 
 #include "Biquad.h"

src/effects/Silence.h

@@ -13,8 +13,6 @@
 #ifndef __AUDACITY_EFFECT_SILENCE__
 #define __AUDACITY_EFFECT_SILENCE__
 
-#include <wx/string.h>
-
 #include "../widgets/NumericTextCtrl.h"
 
 #include "Generator.h"

src/effects/StereoToMono.h

@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_EFFECT_STEREO_TO_MONO__
 #define __AUDACITY_EFFECT_STEREO_TO_MONO__
 
-#include <wx/string.h>
-
 #include "Effect.h"
 
 #define STEREOTOMONO_PLUGIN_SYMBOL ComponentInterfaceSymbol{ XO("Stereo To Mono") }

src/effects/TimeScale.h

@@ -17,7 +17,6 @@
 
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "SBSMSEffect.h"

src/effects/ToneGen.h

@@ -14,7 +14,6 @@
 #define __AUDACITY_EFFECT_TONEGEN__
 
 #include <wx/arrstr.h>
-#include <wx/string.h>
 
 #include "../widgets/NumericTextCtrl.h"
 

src/effects/TruncSilence.h

@@ -20,7 +20,6 @@
 #include <wx/arrstr.h>
 #include <wx/event.h>
 #include <wx/list.h>
-#include <wx/string.h>
 
 #include "Effect.h"
 

src/effects/Wahwah.h

@@ -18,7 +18,6 @@
 
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "Effect.h"

src/effects/lv2/LV2Effect.h

@@ -20,7 +20,6 @@
 #include <wx/event.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "lv2/lv2plug.in/ns/ext/atom/forge.h"

src/effects/lv2/LoadLV2.h

@@ -14,7 +14,6 @@
 
 #include "../../MemoryX.h"
 #include <wx/hashmap.h>
-#include <wx/string.h>
 
 #include <lilv/lilv.h>
 

src/effects/vamp/VampEffect.h

@@ -19,7 +19,6 @@
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/slider.h>
-#include <wx/string.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 

src/export/ExportMultiple.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_EXPORT_MULTIPLE__
 
 #include <wx/dialog.h>
-#include <wx/string.h>
 #include <wx/listctrl.h>
 #include <wx/simplebook.h>
 

src/import/Import.h

@@ -16,7 +16,6 @@
 #include "audacity/Types.h"
 #include <vector>
 #include <wx/arrstr.h>
-#include <wx/string.h>
 #include <wx/listbox.h>
 #include <wx/tokenzr.h>
 

src/prefs/DevicePrefs.h

@@ -15,7 +15,6 @@
 #include <wx/defs.h>
 
 #include <wx/choice.h>
-#include <wx/string.h>
 #include <wx/window.h>
 
 #include "PrefsPanel.h"

src/prefs/KeyConfigPrefs.h

@@ -20,7 +20,6 @@ class ShuttleGui;
 #include <wx/listctrl.h>
 #include <wx/radiobut.h>
 #include <wx/srchctrl.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/timer.h>
 

src/prefs/MidiIOPrefs.h

@@ -22,7 +22,6 @@ class ShuttleGui;
 #include <wx/defs.h>
 
 #include <wx/choice.h>
-#include <wx/string.h>
 #include <wx/window.h>
 
 #include "PrefsPanel.h"

src/prefs/MousePrefs.h

@@ -12,7 +12,6 @@
 #include <wx/defs.h>
 
 #include <wx/listctrl.h>
-#include <wx/string.h>
 #include <wx/window.h>
 
 #include "PrefsPanel.h"

src/prefs/PrefsDialog.h

@@ -16,7 +16,6 @@
 #include <wx/button.h>
 #include <wx/event.h>
 #include <wx/dialog.h>
-#include <wx/string.h>
 #include <wx/treebook.h>
 #include <wx/window.h>
 #include "../widgets/wxPanelWrapper.h"

src/prefs/SpectrumPrefs.h

@@ -24,7 +24,6 @@
 #include "../Experimental.h"
 
 #include <wx/defs.h>
-#include <wx/string.h>
 #include <wx/window.h>
 
 #include "../WaveTrack.h"

src/widgets/FileHistory.h

@@ -17,7 +17,6 @@
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/grid.h>
-#include <wx/string.h>
 #include <wx/window.h>
 #include <wx/weakref.h>
 

src/widgets/Grid.h

@@ -18,7 +18,6 @@
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/grid.h>
-#include <wx/string.h>
 #include <wx/window.h>
 #include "NumericTextCtrl.h"
 #include "../Internat.h"

src/widgets/KeyView.h

@@ -16,7 +16,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/arrstr.h>
-#include <wx/string.h>
 #include <wx/vlbox.h>
 
 #include "../commands/Keyboard.h"

src/widgets/Meter.h

@@ -20,7 +20,6 @@
 #include <wx/brush.h>
 #include <wx/defs.h>
 #include <wx/gdicmn.h>
-#include <wx/string.h>
 #include <wx/timer.h>
 
 #include "../SampleFormat.h"

src/widgets/NumericTextCtrl.h

@@ -25,7 +25,6 @@
 #include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "../Internat.h"

src/widgets/numformatter.h

@@ -14,7 +14,11 @@
 #ifndef _WIDGETS_NUMFORMATTER_H_
 #define _WIDGETS_NUMFORMATTER_H_
 
-#include <wx/string.h>
+#include <cstddef> // for size_t
+#include <wx/chartype.h>
+#include <wx/longlong.h>
+
+class wxString;
 
 #define HAS_LONG_LONG_T_DIFFERENT_FROM_LONG
 

src/xml/XMLTagHandler.h

@@ -20,7 +20,6 @@
 
 #include "../Audacity.h" // for USE_* macros
 
-#include <wx/string.h>
 #include <stdio.h>
 
 #include "audacity/Types.h"