Remove wx/arrstr.h from headers

include/audacity/ComponentInterface.h

@@ -43,6 +43,8 @@
 #define __AUDACITY_COMPONENT_INTERFACE_H__
 
 #include "audacity/Types.h"
+#include <wx/string.h> // member variables
+
 extern AUDACITY_DLL_API const wxString& GetCustomTranslation(const wxString& str1 );
 
 /**************************************************************************//**

include/audacity/Types.h

@@ -43,9 +43,11 @@
 #define __AUDACITY_TYPES_H__
 
 #include <algorithm>
-#include <wx/arrstr.h>
 #include <type_traits>
 #include <vector>
+#include <wx/debug.h> // for wxASSERT
+
+class wxString;
 
 // ----------------------------------------------------------------------------
 // TODO:  I'd imagine this header may be replaced by other public headers. But,

src/AudioIO.h

@@ -53,6 +53,7 @@ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
 
 #include "SampleFormat.h"
 
+class wxArrayString;
 class AudioIO;
 class RingBuffer;
 class Mixer;

src/BatchCommands.h

@@ -16,6 +16,7 @@
 
 #include "export/Export.h"
 
+class wxArrayString;
 class Effect;
 class CommandContext;
 class AudacityProject;

src/FileFormats.h

@@ -14,7 +14,6 @@
 #include "Audacity.h" // for __UNIX__
 
 #include <wx/list.h>
-#include <wx/arrstr.h>
 
 #include "audacity/Types.h"
 

src/FileNames.h

@@ -13,11 +13,11 @@
 
 #include "Audacity.h"
 
+#include <wx/string.h> // function return value
 #include "audacity/Types.h"
 
 class wxFileName;
 class wxFileNameWrapper;
-class wxArrayString;
 
 // Uh, this is really a namespace rather than a class,
 // since all the functions are static.

src/LabelDialog.h

@@ -20,6 +20,7 @@
 #include "widgets/Grid.h"
 #include "widgets/wxPanelWrapper.h"
 
+class wxArrayString;
 class TrackFactory;
 class TrackList;
 class RowData;

src/Languages.h

@@ -11,7 +11,8 @@
 #ifndef __AUDACITY_LANGUAGES__
 #define __AUDACITY_LANGUAGES__
 
-#include <wx/arrstr.h>
+class wxArrayString;
+
 #include <wx/list.h>
 
 void GetLanguages(wxArrayString &langCodes, wxArrayString &langNames);

src/Menus.h

@@ -12,8 +12,9 @@
 
 #include "audacity/Types.h"
 
-#include <wx/arrstr.h>
+#include <wx/string.h> // member variable
 
+class wxArrayString;
 class AudacityProject;
 class CommandContext;
 class CommandManager;

src/MixerBoard.h

@@ -27,6 +27,7 @@
 #include "widgets/wxPanelWrapper.h"
 #include "commands/CommandManagerWindowClasses.h"
 
+class wxArrayString;
 struct TrackListEvent;
 
 // containment hierarchy:

src/ModuleManager.h

@@ -20,6 +20,7 @@
 
 #include "audacity/ModuleInterface.h"
 
+class wxArrayString;
 class CommandHandler;
 
 wxWindow *  MakeHijackPanel();

src/PluginManager.h

@@ -22,6 +22,8 @@
 #include "audacity/ModuleInterface.h"
 #include "audacity/PluginInterface.h"
 
+class wxArrayString;
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // PluginDescriptor

src/Project.h

@@ -47,6 +47,7 @@
 
 const int AudacityProjectTimerID = 5200;
 
+class wxArrayString;
 class wxWindow;
 class wxDialog;
 class wxBoxSizer;

src/Tags.h

@@ -43,6 +43,7 @@
 
 #include <unordered_map>
 
+class wxArrayString;
 class wxButton;
 class wxChoice;
 class wxComboBox;

src/Theme.h

@@ -24,6 +24,8 @@
 #include <wx/image.h>
 #include <wx/window.h> // to inherit
 
+class wxArrayString;
+
 // JKC: will probably change name from 'teBmps' to 'tIndexBmp';
 typedef int teBmps; /// The index of a bitmap resource in Theme Resources.
 

src/commands/CommandManager.h

@@ -32,6 +32,7 @@
 
 class wxMenu;
 class wxMenuBar;
+class wxArrayString;
 class TranslatedInternalString;
 using CommandParameter = CommandID;
 

src/commands/Validators.h

@@ -43,6 +43,8 @@ a certain criterion. This is a base validator which allows anything.
 #ifndef __VALIDATORS__
 #define __VALIDATORS__
 
+class wxArrayString;
+
 #include "../MemoryX.h"
 
 class Validator /* not final */

src/effects/Distortion.h

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

src/effects/Effect.h

@@ -41,6 +41,7 @@ class wxWindow;
 
 #include "../Track.h"
 
+class wxArrayString;
 class ShuttleGui;
 class AudacityCommand;
 

src/effects/ScienFilter.h

@@ -15,7 +15,6 @@ Vaughan Johnson (Preview)
 
 #include <wx/setup.h> // for wxUSE_* macros
 
-#include <wx/arrstr.h>
 #include <wx/bitmap.h>
 #include <wx/choice.h>
 #include <wx/event.h>

src/effects/ToneGen.h

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

src/effects/TruncSilence.h

@@ -17,7 +17,6 @@
 #ifndef __AUDACITY_EFFECT_TRUNC_SILENCE__
 #define __AUDACITY_EFFECT_TRUNC_SILENCE__
 
-#include <wx/arrstr.h>
 #include <wx/event.h>
 #include <wx/list.h>
 

src/effects/lv2/LV2Effect.h

@@ -13,6 +13,8 @@
 
 #if USE_LV2
 
+class wxArrayString;
+
 #include "../../MemoryX.h"
 #include <vector>
 #include <wx/checkbox.h>

src/effects/nyquist/Nyquist.h

@@ -27,6 +27,8 @@
 
 #include "nyx.h"
 
+class wxArrayString;
+
 #define NYQUISTEFFECTS_VERSION wxT("1.0.0.0")
 /* i18n-hint: "Nyquist" is an embedded interpreted programming language in
  Audacity, named in honor of the Swedish-American Harry Nyquist (or Nyqvist).

src/export/Export.h

@@ -20,6 +20,7 @@
 #include "../SampleFormat.h"
 #include "../widgets/wxPanelWrapper.h"
 
+class wxArrayString;
 class FileDialogWrapper;
 class wxFileCtrlEvent;
 class wxMemoryDC;

src/export/ExportFFmpegDialogs.h

@@ -27,6 +27,8 @@ LRN
 
 class wxArrayStringEx;
 
+class wxArrayString;
+
 /// Identifiers for pre-set export types.
 enum FFmpegExposedFormat
 {

src/import/Import.h

@@ -15,12 +15,12 @@
 #include "ImportForwards.h"
 #include "audacity/Types.h"
 #include <vector>
-#include <wx/arrstr.h>
 #include <wx/listbox.h>
 #include <wx/tokenzr.h>
 
 #include "../widgets/wxPanelWrapper.h"
 
+class wxArrayString;
 class Tags;
 class TrackFactory;
 class Track;

src/import/ImportPlugin.h

@@ -66,6 +66,7 @@ but little else.
 
 #include "ImportRaw.h" // defines TrackHolders
 
+class wxArrayString;
 class TrackFactory;
 class Track;
 class Tags;

src/ondemand/ODDecodeFlacTask.h

@@ -34,6 +34,7 @@ robust enough to allow all the user changes such as copy/paste, DELETE, and so o
 
 #include "FLAC++/decoder.h"
 
+class wxArrayString;
 class ODDecodeBlockFile;
 class WaveTrack;
 class ODFileDecoder;

src/prefs/EffectsPrefs.h

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

src/prefs/GUIPrefs.h

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

src/prefs/ModulePrefs.h

@@ -20,6 +20,7 @@
 #include "PrefsPanel.h"
 
 
+class wxArrayString;
 class ShuttleGui;
 
 enum {

src/prefs/QualityPrefs.h

@@ -15,7 +15,6 @@
 #include <vector>
 #include <wx/defs.h>
 
-#include <wx/arrstr.h>
 #include <wx/choice.h>
 #include <wx/textctrl.h>
 

src/prefs/SpectrogramSettings.h

@@ -21,7 +21,6 @@ Paul Licameli
 struct FFTParam;
 class NumberScale;
 class SpectrumPrefs;
-class wxArrayString;
 class wxArrayStringEx;
 
 class SpectrogramSettings

src/prefs/SpectrumPrefs.h

@@ -32,7 +32,6 @@
 #include "SpectrogramSettings.h"
 
 class wxArrayStringEx;
-
 class wxChoice;
 class wxCheckBox;
 class wxTextCtrl;

src/prefs/TracksPrefs.h

@@ -15,7 +15,6 @@
 
 //#include <wx/defs.h>
 
-//#include <wx/arrstr.h>
 //#include <wx/window.h>
 
 #include <vector>

src/widgets/ASlider.cpp

@@ -77,6 +77,8 @@ const int sliderFontSize = 12;
 #define OPTIONAL_SLIDER_TICKS
 #endif
 
+class wxArrayString;
+
 //
 // TipPanel
 //

src/widgets/ASlider.h

@@ -26,6 +26,7 @@
 #include "WindowAccessible.h"
 #endif
 
+class wxArrayString;
 class wxBitmap;
 class wxCursor;
 class wxImage;

src/widgets/Grid.h

@@ -30,6 +30,7 @@ class GridAx;
 
 #endif
 
+class wxArrayString;
 class NumericTextCtrl;
 
 /**********************************************************************//**

src/widgets/KeyView.h

@@ -15,11 +15,12 @@
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/arrstr.h>
 #include <wx/vlbox.h>
 
 #include "../commands/Keyboard.h"
 
+class wxArrayString;
+
 // Class holding all information about a node.  Rather than a real tree
 // we store these in an array and simulate a tree.
 class KeyNode

src/wxFileNameWrapper.h

@@ -11,6 +11,8 @@ Paul Licameli
 #ifndef __AUDACITY_WXFILENAMEWRAPPER__
 #define __AUDACITY_WXFILENAMEWRAPPER__
 
+class wxArrayString;
+
 // 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

src/xml/XMLWriter.h

@@ -11,7 +11,6 @@
 #define __AUDACITY_XML_XML_FILE_WRITER__
 
 #include <vector>
-#include <wx/arrstr.h>
 #include <wx/ffile.h>
 
 #include "../FileException.h"