From cfbdd2d22ec0eca24b8f7bb2e78e7858e8a8fcf9 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 6 Jun 2021 12:18:35 -0400 Subject: [PATCH] Type alias ManualPageID for wxString used in many places... ... eliminating many direct mentions of wxString. A real type distinction will be made next. --- libraries/lib-strings/Identifier.h | 2 ++ src/BatchCommandDialog.cpp | 2 +- src/BatchCommandDialog.h | 2 +- src/BatchProcessDialog.cpp | 2 +- src/BatchProcessDialog.h | 6 +++--- src/LabelDialog.cpp | 2 +- src/LabelDialog.h | 4 ++-- src/commands/AudacityCommand.h | 2 +- src/commands/CompareAudioCommand.h | 2 +- src/commands/Demo.h | 2 +- src/commands/DragCommand.h | 2 +- src/commands/GetInfoCommand.h | 2 +- src/commands/GetTrackInfoCommand.h | 2 +- src/commands/HelpCommand.h | 4 ++-- src/commands/ImportExportCommands.h | 4 ++-- src/commands/MessageCommand.h | 2 +- src/commands/OpenSaveCommands.h | 10 +++++----- src/commands/PreferenceCommands.h | 4 ++-- src/commands/ScreenshotCommand.h | 2 +- src/commands/SelectCommand.h | 8 ++++---- src/commands/SetClipCommand.h | 2 +- src/commands/SetEnvelopeCommand.h | 2 +- src/commands/SetLabelCommand.h | 2 +- src/commands/SetProjectCommand.h | 2 +- src/commands/SetTrackInfoCommand.h | 8 ++++---- src/effects/Amplify.cpp | 4 ++-- src/effects/Amplify.h | 2 +- src/effects/AutoDuck.cpp | 4 ++-- src/effects/AutoDuck.h | 2 +- src/effects/BassTreble.cpp | 4 ++-- src/effects/BassTreble.h | 2 +- src/effects/ChangePitch.cpp | 4 ++-- src/effects/ChangePitch.h | 2 +- src/effects/ChangeSpeed.cpp | 4 ++-- src/effects/ChangeSpeed.h | 2 +- src/effects/ChangeTempo.cpp | 4 ++-- src/effects/ChangeTempo.h | 2 +- src/effects/ClickRemoval.cpp | 4 ++-- src/effects/ClickRemoval.h | 2 +- src/effects/Compressor.cpp | 4 ++-- src/effects/Compressor.h | 2 +- src/effects/Distortion.cpp | 4 ++-- src/effects/Distortion.h | 2 +- src/effects/DtmfGen.cpp | 4 ++-- src/effects/DtmfGen.h | 2 +- src/effects/Echo.cpp | 4 ++-- src/effects/Echo.h | 2 +- src/effects/Effect.cpp | 8 ++++---- src/effects/Effect.h | 4 ++-- src/effects/EffectManager.cpp | 2 +- src/effects/EffectManager.h | 2 +- src/effects/Equalization.cpp | 8 ++++---- src/effects/Equalization.h | 2 +- src/effects/FindClipping.cpp | 4 ++-- src/effects/FindClipping.h | 2 +- src/effects/Loudness.cpp | 4 ++-- src/effects/Loudness.h | 2 +- src/effects/Noise.cpp | 4 ++-- src/effects/Noise.h | 2 +- src/effects/Normalize.cpp | 4 ++-- src/effects/Normalize.h | 2 +- src/effects/Paulstretch.cpp | 4 ++-- src/effects/Paulstretch.h | 2 +- src/effects/Phaser.cpp | 4 ++-- src/effects/Phaser.h | 2 +- src/effects/Repeat.cpp | 4 ++-- src/effects/Repeat.h | 2 +- src/effects/Reverb.cpp | 4 ++-- src/effects/Reverb.h | 2 +- src/effects/ScienFilter.cpp | 4 ++-- src/effects/ScienFilter.h | 2 +- src/effects/Silence.cpp | 4 ++-- src/effects/Silence.h | 2 +- src/effects/TimeScale.cpp | 4 ++-- src/effects/TimeScale.h | 2 +- src/effects/ToneGen.cpp | 6 +++--- src/effects/ToneGen.h | 2 +- src/effects/TruncSilence.cpp | 4 ++-- src/effects/TruncSilence.h | 2 +- src/effects/Wahwah.cpp | 4 ++-- src/effects/Wahwah.h | 2 +- src/effects/nyquist/Nyquist.cpp | 4 ++-- src/effects/nyquist/Nyquist.h | 4 ++-- src/menus/HelpMenus.cpp | 8 ++++---- src/prefs/ApplicationPrefs.cpp | 2 +- src/prefs/ApplicationPrefs.h | 2 +- src/prefs/BatchPrefs.cpp | 2 +- src/prefs/BatchPrefs.h | 2 +- src/prefs/DevicePrefs.cpp | 2 +- src/prefs/DevicePrefs.h | 2 +- src/prefs/DirectoriesPrefs.cpp | 2 +- src/prefs/DirectoriesPrefs.h | 2 +- src/prefs/EffectsPrefs.cpp | 2 +- src/prefs/EffectsPrefs.h | 2 +- src/prefs/ExtImportPrefs.cpp | 2 +- src/prefs/ExtImportPrefs.h | 2 +- src/prefs/GUIPrefs.cpp | 2 +- src/prefs/GUIPrefs.h | 2 +- src/prefs/ImportExportPrefs.cpp | 2 +- src/prefs/ImportExportPrefs.h | 2 +- src/prefs/KeyConfigPrefs.cpp | 2 +- src/prefs/KeyConfigPrefs.h | 2 +- src/prefs/LibraryPrefs.cpp | 2 +- src/prefs/LibraryPrefs.h | 2 +- src/prefs/MidiIOPrefs.cpp | 2 +- src/prefs/MidiIOPrefs.h | 2 +- src/prefs/ModulePrefs.cpp | 2 +- src/prefs/ModulePrefs.h | 2 +- src/prefs/MousePrefs.cpp | 2 +- src/prefs/MousePrefs.h | 2 +- src/prefs/PlaybackPrefs.cpp | 2 +- src/prefs/PlaybackPrefs.h | 2 +- src/prefs/PrefsDialog.cpp | 2 +- src/prefs/PrefsPanel.cpp | 4 ++-- src/prefs/PrefsPanel.h | 6 +++--- src/prefs/QualityPrefs.cpp | 2 +- src/prefs/QualityPrefs.h | 2 +- src/prefs/RecordingPrefs.cpp | 2 +- src/prefs/RecordingPrefs.h | 2 +- src/prefs/SpectrumPrefs.cpp | 2 +- src/prefs/SpectrumPrefs.h | 2 +- src/prefs/ThemePrefs.cpp | 2 +- src/prefs/ThemePrefs.h | 2 +- src/prefs/TracksBehaviorsPrefs.cpp | 2 +- src/prefs/TracksBehaviorsPrefs.h | 2 +- src/prefs/TracksPrefs.cpp | 2 +- src/prefs/TracksPrefs.h | 2 +- src/prefs/WarningsPrefs.cpp | 2 +- src/prefs/WarningsPrefs.h | 2 +- src/prefs/WaveformPrefs.cpp | 2 +- src/prefs/WaveformPrefs.h | 2 +- src/tracks/ui/CommonTrackControls.cpp | 2 +- src/widgets/ErrorDialog.cpp | 6 +++--- src/widgets/ErrorDialog.h | 8 ++++---- src/widgets/HelpSystem.cpp | 2 +- src/widgets/HelpSystem.h | 2 +- src/widgets/MultiDialog.cpp | 2 +- 137 files changed, 200 insertions(+), 198 deletions(-) diff --git a/libraries/lib-strings/Identifier.h b/libraries/lib-strings/Identifier.h index d11d45e17..e8293de16 100644 --- a/libraries/lib-strings/Identifier.h +++ b/libraries/lib-strings/Identifier.h @@ -232,5 +232,7 @@ struct CommandIdTag; using CommandID = TaggedIdentifier< CommandIdTag, false >; using CommandIDs = std::vector; +using ManualPageID = wxString; + #endif diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp index 402469a5b..8292623b9 100644 --- a/src/BatchCommandDialog.cpp +++ b/src/BatchCommandDialog.cpp @@ -173,7 +173,7 @@ void MacroCommandDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) void MacroCommandDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) { - wxString page = GetHelpPageName(); + const auto &page = GetHelpPageName(); HelpSystem::ShowHelp(this, page, true); } diff --git a/src/BatchCommandDialog.h b/src/BatchCommandDialog.h index ed6606a42..d2f062edd 100644 --- a/src/BatchCommandDialog.h +++ b/src/BatchCommandDialog.h @@ -42,7 +42,7 @@ class MacroCommandDialog final : public wxDialogWrapper { void OnCancel(wxCommandEvent &event); void OnHelp(wxCommandEvent &event); void OnItemSelected(wxListEvent &event); - wxString GetHelpPageName() { return wxT("Scripting Reference") ; } + ManualPageID GetHelpPageName() { return L"Scripting Reference" ; } void ValidateChoices(); void PopulateCommandList(); diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 32390e9c0..2b9051e99 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -222,7 +222,7 @@ void ApplyMacroDialog::PopulateMacros() void ApplyMacroDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) { - wxString page = GetHelpPageName(); + const auto &page = GetHelpPageName(); HelpSystem::ShowHelp(this, page, true); } diff --git a/src/BatchProcessDialog.h b/src/BatchProcessDialog.h index d1eb45478..b5f2286e4 100644 --- a/src/BatchProcessDialog.h +++ b/src/BatchProcessDialog.h @@ -41,7 +41,7 @@ class ApplyMacroDialog : public wxDialogWrapper { virtual void OnCancel(wxCommandEvent & event); virtual void OnHelp(wxCommandEvent & event); - virtual wxString GetHelpPageName() {return "Apply_Macro";}; + virtual ManualPageID GetHelpPageName() {return "Apply_Macro";} void PopulateMacros(); static CommandID MacroIdOfName( const wxString & MacroName ); @@ -87,9 +87,9 @@ private: void OnApplyToFiles(wxCommandEvent & event) override; void OnCancel(wxCommandEvent &event) override; - virtual wxString GetHelpPageName() override {return + virtual ManualPageID GetHelpPageName() override {return mbExpanded ? "Manage_Macros" - : "Apply_Macro";}; + : "Apply_Macro";} void PopulateList(); void AddItem(const CommandID &command, wxString const ¶ms); diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index 715c3555e..fce862482 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -285,7 +285,7 @@ void LabelDialog::PopulateOrExchange( ShuttleGui & S ) void LabelDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) { - wxString page = GetHelpPageName(); + const auto &page = GetHelpPageName(); HelpSystem::ShowHelp(this, page, true); } diff --git a/src/LabelDialog.h b/src/LabelDialog.h index dae429dca..e3d65e82a 100644 --- a/src/LabelDialog.h +++ b/src/LabelDialog.h @@ -60,8 +60,8 @@ class LabelDialog final : public wxDialogWrapper void Populate(); void PopulateOrExchange( ShuttleGui & S ); void PopulateLabels(); - virtual void OnHelp(wxCommandEvent & event); - virtual wxString GetHelpPageName() {return "Labels_Editor";}; + void OnHelp(wxCommandEvent & event); + ManualPageID GetHelpPageName() {return "Labels_Editor";} bool TransferDataToWindow() override; bool TransferDataFromWindow() override; diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index bbf47ccb4..e4327d17d 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -65,7 +65,7 @@ class AUDACITY_DLL_API AudacityCommand /* not final */ : public wxEvtHandler, {wxFAIL_MSG( "Implement a Description for this command");return XO("FAIL");}; // Name of page in the Audacity alpha manual - virtual wxString ManualPage(){ return wxEmptyString;}; + virtual ManualPageID ManualPage(){ return {}; } virtual bool IsBatchProcessing(){ return mIsBatch;} virtual void SetBatchProcessing(bool start){ mIsBatch = start;}; diff --git a/src/commands/CompareAudioCommand.h b/src/commands/CompareAudioCommand.h index 87f61cd75..4d0133352 100644 --- a/src/commands/CompareAudioCommand.h +++ b/src/commands/CompareAudioCommand.h @@ -35,7 +35,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#compare_Audio");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#compare_Audio";} bool Apply(const CommandContext &context) override; diff --git a/src/commands/Demo.h b/src/commands/Demo.h index cb717bc95..cb76b0c84 100644 --- a/src/commands/Demo.h +++ b/src/commands/Demo.h @@ -29,7 +29,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I";} private: double delay; diff --git a/src/commands/DragCommand.h b/src/commands/DragCommand.h index bdbc6b95d..a1856adbb 100644 --- a/src/commands/DragCommand.h +++ b/src/commands/DragCommand.h @@ -32,7 +32,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#move_mouse");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#move_mouse";} bool Apply(const CommandContext & context) override; diff --git a/src/commands/GetInfoCommand.h b/src/commands/GetInfoCommand.h index 2c2392500..a7b76a756 100644 --- a/src/commands/GetInfoCommand.h +++ b/src/commands/GetInfoCommand.h @@ -38,7 +38,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#get_info");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#get_info";} bool Apply(const CommandContext &context) override; bool ApplyInner(const CommandContext &context); diff --git a/src/commands/GetTrackInfoCommand.h b/src/commands/GetTrackInfoCommand.h index 190899e55..c6c00e584 100644 --- a/src/commands/GetTrackInfoCommand.h +++ b/src/commands/GetTrackInfoCommand.h @@ -32,7 +32,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Tools#get_track_info");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Tools#get_track_info";} bool Apply(const CommandContext &context ) override; public: diff --git a/src/commands/HelpCommand.h b/src/commands/HelpCommand.h index a88529c12..62bddb87d 100644 --- a/src/commands/HelpCommand.h +++ b/src/commands/HelpCommand.h @@ -38,7 +38,7 @@ public: bool ApplyInner(const CommandContext & context); // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#help");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#help";} public: wxString mCommandName; }; @@ -58,7 +58,7 @@ public: return true; }; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#comment");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#comment";} public: wxString mComment; }; diff --git a/src/commands/ImportExportCommands.h b/src/commands/ImportExportCommands.h index 24adc7459..dc3024eee 100644 --- a/src/commands/ImportExportCommands.h +++ b/src/commands/ImportExportCommands.h @@ -36,7 +36,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#import");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#import";} public: wxString mFileName; }; @@ -54,7 +54,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#export");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#export";} public: wxString mFileName; int mnChannels; diff --git a/src/commands/MessageCommand.h b/src/commands/MessageCommand.h index 4ac152d29..1899eb40c 100644 --- a/src/commands/MessageCommand.h +++ b/src/commands/MessageCommand.h @@ -37,7 +37,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#message");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#message";} public: wxString mMessage; }; diff --git a/src/commands/OpenSaveCommands.h b/src/commands/OpenSaveCommands.h index 34d375175..1ea614bd3 100644 --- a/src/commands/OpenSaveCommands.h +++ b/src/commands/OpenSaveCommands.h @@ -40,7 +40,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#open_project");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#open_project";} public: wxString mFileName; bool mbAddToHistory; @@ -60,7 +60,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#save_project");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#save_project";} public: wxString mFileName; bool mbAddToHistory; @@ -80,7 +80,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#save_copy");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#save_copy";} public: wxString mFileName; }; @@ -98,7 +98,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#save_log");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#save_log";} public: wxString mFileName; }; @@ -116,7 +116,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#Clear_log");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#Clear_log";} public: wxString mFileName; }; diff --git a/src/commands/PreferenceCommands.h b/src/commands/PreferenceCommands.h index f492ba029..cfe4ec1e8 100644 --- a/src/commands/PreferenceCommands.h +++ b/src/commands/PreferenceCommands.h @@ -39,7 +39,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#get_preference");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#get_preference";} wxString mName; }; @@ -59,7 +59,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_preference");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_preference";} wxString mName; wxString mValue; diff --git a/src/commands/ScreenshotCommand.h b/src/commands/ScreenshotCommand.h index 6067873a3..2b1fb0f5a 100644 --- a/src/commands/ScreenshotCommand.h +++ b/src/commands/ScreenshotCommand.h @@ -87,7 +87,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#screenshot_short_format");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#screenshot_short_format";} private: int mWhat; diff --git a/src/commands/SelectCommand.h b/src/commands/SelectCommand.h index d03bd660d..2703fefe6 100644 --- a/src/commands/SelectCommand.h +++ b/src/commands/SelectCommand.h @@ -37,7 +37,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#select_time");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#select_time";} bool bHasT0; bool bHasT1; @@ -63,7 +63,7 @@ public: bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#select_frequencies");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#select_frequencies";} bool bHasBottom; bool bHasTop; @@ -85,7 +85,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#select_tracks");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#select_tracks";} bool bHasFirstTrack; bool bHasNumTracks; @@ -123,7 +123,7 @@ public: mSelTracks.Apply(context); } // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#select");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#select";} private: SelectTimeCommand mSelTime; SelectFrequenciesCommand mSelFreq; diff --git a/src/commands/SetClipCommand.h b/src/commands/SetClipCommand.h index a2ff3f39e..528d94289 100644 --- a/src/commands/SetClipCommand.h +++ b/src/commands/SetClipCommand.h @@ -31,7 +31,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_clip");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_clip";} bool ApplyInner( const CommandContext & context, Track * t ) override; public: diff --git a/src/commands/SetEnvelopeCommand.h b/src/commands/SetEnvelopeCommand.h index 07da8c9b8..80d1246db 100644 --- a/src/commands/SetEnvelopeCommand.h +++ b/src/commands/SetEnvelopeCommand.h @@ -31,7 +31,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_envelope");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_envelope";} bool ApplyInner( const CommandContext & context, Track * t ) override; public: diff --git a/src/commands/SetLabelCommand.h b/src/commands/SetLabelCommand.h index 74d152b5a..e9c1dbd93 100644 --- a/src/commands/SetLabelCommand.h +++ b/src/commands/SetLabelCommand.h @@ -32,7 +32,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_label");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_label";} bool Apply(const CommandContext & context) override; diff --git a/src/commands/SetProjectCommand.h b/src/commands/SetProjectCommand.h index 16f02c1b7..533462657 100644 --- a/src/commands/SetProjectCommand.h +++ b/src/commands/SetProjectCommand.h @@ -33,7 +33,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_project");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_project";} bool Apply(const CommandContext & context) override; diff --git a/src/commands/SetTrackInfoCommand.h b/src/commands/SetTrackInfoCommand.h index e51f228bf..9e551c4c6 100644 --- a/src/commands/SetTrackInfoCommand.h +++ b/src/commands/SetTrackInfoCommand.h @@ -54,7 +54,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_track_status");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_track_status";} bool ApplyInner( const CommandContext & context, Track * t ) override; public: @@ -81,7 +81,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_track_audio");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_track_audio";} bool ApplyInner( const CommandContext & context, Track * t ) override; public: @@ -110,7 +110,7 @@ public: void PopulateOrExchange(ShuttleGui & S) override; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_I#set_track_visuals");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_I#set_track_visuals";} bool ApplyInner( const CommandContext & context, Track * t ) override; public: @@ -150,7 +150,7 @@ public: ComponentInterfaceSymbol GetSymbol() override {return Symbol;}; TranslatableString GetDescription() override {return XO("Sets various values for a track.");}; // AudacityCommand overrides - wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#set_track");}; + ManualPageID ManualPage() override {return L"Extra_Menu:_Scriptables_II#set_track";} public: diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp index 6866141ce..6fc971977 100644 --- a/src/effects/Amplify.cpp +++ b/src/effects/Amplify.cpp @@ -99,9 +99,9 @@ TranslatableString EffectAmplify::GetDescription() return XO("Increases or decreases the volume of the audio you have selected"); } -wxString EffectAmplify::ManualPage() +ManualPageID EffectAmplify::ManualPage() { - return wxT("Amplify"); + return L"Amplify"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h index b2f87d100..896d7d569 100644 --- a/src/effects/Amplify.h +++ b/src/effects/Amplify.h @@ -35,7 +35,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index 104973a1f..e75e85fb4 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -118,9 +118,9 @@ TranslatableString EffectAutoDuck::GetDescription() return XO("Reduces (ducks) the volume of one or more tracks whenever the volume of a specified \"control\" track reaches a particular level"); } -wxString EffectAutoDuck::ManualPage() +ManualPageID EffectAutoDuck::ManualPage() { - return wxT("Auto_Duck"); + return L"Auto_Duck"; } // EffectDefinitionInterface implementation diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index ffbf137c4..c13bd065a 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -32,7 +32,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index 1f3384a94..8d9b8518c 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -98,9 +98,9 @@ TranslatableString EffectBassTreble::GetDescription() return XO("Simple tone control effect"); } -wxString EffectBassTreble::ManualPage() +ManualPageID EffectBassTreble::ManualPage() { - return wxT("Bass_and_Treble"); + return L"Bass_and_Treble"; } // EffectDefinitionInterface implementation diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h index 333c0b032..b25243fc1 100644 --- a/src/effects/BassTreble.h +++ b/src/effects/BassTreble.h @@ -45,7 +45,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp index 2eb022fb2..b9519b525 100644 --- a/src/effects/ChangePitch.cpp +++ b/src/effects/ChangePitch.cpp @@ -150,9 +150,9 @@ TranslatableString EffectChangePitch::GetDescription() return XO("Changes the pitch of a track without changing its tempo"); } -wxString EffectChangePitch::ManualPage() +ManualPageID EffectChangePitch::ManualPage() { - return wxT("Change_Pitch"); + return L"Change_Pitch"; } // EffectDefinitionInterface implementation diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index 34f9ccdc0..71364a4a9 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -46,7 +46,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index 98252b17c..b37c52db6 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -123,9 +123,9 @@ TranslatableString EffectChangeSpeed::GetDescription() return XO("Changes the speed of a track, also changing its pitch"); } -wxString EffectChangeSpeed::ManualPage() +ManualPageID EffectChangeSpeed::ManualPage() { - return wxT("Change_Speed"); + return L"Change_Speed"; } diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 079e4c32a..33b0d2922 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -33,7 +33,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp index d400dafc1..86267208c 100644 --- a/src/effects/ChangeTempo.cpp +++ b/src/effects/ChangeTempo.cpp @@ -124,9 +124,9 @@ TranslatableString EffectChangeTempo::GetDescription() return XO("Changes the tempo of a selection without changing its pitch"); } -wxString EffectChangeTempo::ManualPage() +ManualPageID EffectChangeTempo::ManualPage() { - return wxT("Change_Tempo"); + return L"Change_Tempo"; } // EffectDefinitionInterface implementation diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index 5706b4bde..777da2b9c 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -40,7 +40,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 4c8b0a624..8d0ba6526 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -93,9 +93,9 @@ TranslatableString EffectClickRemoval::GetDescription() return XO("Click Removal is designed to remove clicks on audio tracks"); } -wxString EffectClickRemoval::ManualPage() +ManualPageID EffectClickRemoval::ManualPage() { - return wxT("Click_Removal"); + return L"Click_Removal"; } // EffectDefinitionInterface implementation diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h index e6033f213..68b68fe7e 100644 --- a/src/effects/ClickRemoval.h +++ b/src/effects/ClickRemoval.h @@ -35,7 +35,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index 45ce2cc14..c92f78a94 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -115,9 +115,9 @@ TranslatableString EffectCompressor::GetDescription() return XO("Compresses the dynamic range of audio"); } -wxString EffectCompressor::ManualPage() +ManualPageID EffectCompressor::ManualPage() { - return wxT("Compressor"); + return L"Compressor"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index ee31f3319..a01389a20 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -31,7 +31,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index 97d9e2e65..6c1d9eeac 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -198,9 +198,9 @@ TranslatableString EffectDistortion::GetDescription() return XO("Waveshaping distortion effect"); } -wxString EffectDistortion::ManualPage() +ManualPageID EffectDistortion::ManualPage() { - return wxT("Distortion"); + return L"Distortion"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h index be0bca4d6..f3d5a68ed 100644 --- a/src/effects/Distortion.h +++ b/src/effects/Distortion.h @@ -65,7 +65,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 537be390b..084674bea 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -110,9 +110,9 @@ TranslatableString EffectDtmf::GetDescription() return XO("Generates dual-tone multi-frequency (DTMF) tones like those produced by the keypad on telephones"); } -wxString EffectDtmf::ManualPage() +ManualPageID EffectDtmf::ManualPage() { - return wxT("DTMF_Tones"); + return L"DTMF_Tones"; } // EffectDefinitionInterface implementation diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h index db13eca32..44ce1f4c6 100644 --- a/src/effects/DtmfGen.h +++ b/src/effects/DtmfGen.h @@ -34,7 +34,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index 13b98f195..20d6e7be2 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -67,9 +67,9 @@ TranslatableString EffectEcho::GetDescription() return XO("Repeats the selected audio again and again"); } -wxString EffectEcho::ManualPage() +ManualPageID EffectEcho::ManualPage() { - return wxT("Echo"); + return L"Echo"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Echo.h b/src/effects/Echo.h index d97b7f21c..b4db4fdc8 100644 --- a/src/effects/Echo.h +++ b/src/effects/Echo.h @@ -28,7 +28,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index f947e9b3e..3b807cdfd 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -1168,14 +1168,14 @@ bool Effect::HasFactoryDefaults() return HasPrivateConfigGroup(GetFactoryDefaultsGroup()); } -wxString Effect::ManualPage() +ManualPageID Effect::ManualPage() { - return wxEmptyString; + return {}; } -wxString Effect::HelpPage() +FilePath Effect::HelpPage() { - return wxEmptyString; + return {}; } void Effect::SetUIFlags(unsigned flags) { diff --git a/src/effects/Effect.h b/src/effects/Effect.h index 4ac97f979..08508c89f 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -237,9 +237,9 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler, virtual bool HasFactoryDefaults(); // Name of page in the Audacity alpha manual - virtual wxString ManualPage(); + virtual ManualPageID ManualPage(); // Fully qualified local help file name - virtual wxString HelpPage(); + virtual FilePath HelpPage(); virtual void SetUIFlags(unsigned flags); virtual unsigned TestUIFlags(unsigned mask); diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index 1e2956013..0b6f9e8b4 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -135,7 +135,7 @@ TranslatableString EffectManager::GetCommandDescription(const PluginID & ID) return {}; } -wxString EffectManager::GetCommandUrl(const PluginID & ID) +ManualPageID EffectManager::GetCommandUrl(const PluginID & ID) { Effect* pEff = GetEffect(ID); if( pEff ) diff --git a/src/effects/EffectManager.h b/src/effects/EffectManager.h index 5578207f7..d51872f9c 100644 --- a/src/effects/EffectManager.h +++ b/src/effects/EffectManager.h @@ -96,7 +96,7 @@ public: TranslatableString GetCommandName(const PluginID & ID); CommandID GetCommandIdentifier(const PluginID & ID); TranslatableString GetCommandDescription(const PluginID & ID); - wxString GetCommandUrl(const PluginID & ID); + ManualPageID GetCommandUrl(const PluginID & ID); TranslatableString GetCommandTip(const PluginID & ID); // flags control which commands are included. void GetCommandDefinition(const PluginID & ID, const CommandContext & context, int flags); diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index ad1fbd0fa..578a12e77 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -348,14 +348,14 @@ TranslatableString EffectEqualization::GetDescription() return XO("Adjusts the volume levels of particular frequencies"); } -wxString EffectEqualization::ManualPage() +ManualPageID EffectEqualization::ManualPage() { // Bug 2509: Must use _ and not space in names. if( mOptions == kEqOptionGraphic ) - return wxT("Graphic_EQ"); + return L"Graphic_EQ"; if( mOptions == kEqOptionCurve ) - return wxT("Filter_Curve_EQ"); - return wxT("Equalization"); + return L"Filter_Curve_EQ"; + return L"Equalization"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index 686e65525..b0a908467 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -103,7 +103,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index 180bdc737..85d0be58a 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -68,9 +68,9 @@ TranslatableString EffectFindClipping::GetDescription() return XO("Creates labels where clipping is detected"); } -wxString EffectFindClipping::ManualPage() +ManualPageID EffectFindClipping::ManualPage() { - return wxT("Find_Clipping"); + return L"Find_Clipping"; } // EffectDefinitionInterface implementation diff --git a/src/effects/FindClipping.h b/src/effects/FindClipping.h index 4aef32ee1..88bab7080 100644 --- a/src/effects/FindClipping.h +++ b/src/effects/FindClipping.h @@ -30,7 +30,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Loudness.cpp b/src/effects/Loudness.cpp index 3c17d9c87..8cb81e170 100644 --- a/src/effects/Loudness.cpp +++ b/src/effects/Loudness.cpp @@ -93,9 +93,9 @@ TranslatableString EffectLoudness::GetDescription() return XO("Sets the loudness of one or more tracks"); } -wxString EffectLoudness::ManualPage() +ManualPageID EffectLoudness::ManualPage() { - return wxT("Loudness_Normalization"); + return L"Loudness_Normalization"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Loudness.h b/src/effects/Loudness.h index 4ea00eaa4..a7e1bdd7f 100644 --- a/src/effects/Loudness.h +++ b/src/effects/Loudness.h @@ -38,7 +38,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 33c337f39..fb08cfb88 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -91,9 +91,9 @@ TranslatableString EffectNoise::GetDescription() return XO("Generates one of three different types of noise"); } -wxString EffectNoise::ManualPage() +ManualPageID EffectNoise::ManualPage() { - return wxT("Noise"); + return L"Noise"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Noise.h b/src/effects/Noise.h index a411abb85..77f424bb6 100644 --- a/src/effects/Noise.h +++ b/src/effects/Noise.h @@ -30,7 +30,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index 30b50d0c2..e5aad0ef4 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -78,9 +78,9 @@ TranslatableString EffectNormalize::GetDescription() return XO("Sets the peak amplitude of one or more tracks"); } -wxString EffectNormalize::ManualPage() +ManualPageID EffectNormalize::ManualPage() { - return wxT("Normalize"); + return L"Normalize"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h index 2ba30ff3f..554667a29 100644 --- a/src/effects/Normalize.h +++ b/src/effects/Normalize.h @@ -32,7 +32,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 6a504104e..5dd1b781c 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -117,9 +117,9 @@ TranslatableString EffectPaulstretch::GetDescription() return XO("Paulstretch is only for an extreme time-stretch or \"stasis\" effect"); } -wxString EffectPaulstretch::ManualPage() +ManualPageID EffectPaulstretch::ManualPage() { - return wxT("Paulstretch"); + return L"Paulstretch"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Paulstretch.h b/src/effects/Paulstretch.h index 5abc5d3e9..8e20a7aad 100644 --- a/src/effects/Paulstretch.h +++ b/src/effects/Paulstretch.h @@ -26,7 +26,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index 498bde218..7374dd167 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -115,9 +115,9 @@ TranslatableString EffectPhaser::GetDescription() return XO("Combines phase-shifted signals with the original signal"); } -wxString EffectPhaser::ManualPage() +ManualPageID EffectPhaser::ManualPage() { - return wxT("Phaser"); + return L"Phaser"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h index 128faa1c4..dded23ff1 100644 --- a/src/effects/Phaser.h +++ b/src/effects/Phaser.h @@ -51,7 +51,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp index 51fd793cd..539d747b8 100644 --- a/src/effects/Repeat.cpp +++ b/src/effects/Repeat.cpp @@ -75,9 +75,9 @@ TranslatableString EffectRepeat::GetDescription() return XO("Repeats the selection the specified number of times"); } -wxString EffectRepeat::ManualPage() +ManualPageID EffectRepeat::ManualPage() { - return wxT("Repeat"); + return L"Repeat"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h index a68b009b6..0e1b940c9 100644 --- a/src/effects/Repeat.h +++ b/src/effects/Repeat.h @@ -30,7 +30,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index cfe0adc42..c588654e3 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -149,9 +149,9 @@ TranslatableString EffectReverb::GetDescription() return XO("Adds ambience or a \"hall effect\""); } -wxString EffectReverb::ManualPage() +ManualPageID EffectReverb::ManualPage() { - return wxT("Reverb"); + return L"Reverb"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h index d7b61c4cc..0accfc831 100644 --- a/src/effects/Reverb.h +++ b/src/effects/Reverb.h @@ -47,7 +47,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index 4b21083e7..cf61f32a8 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -192,9 +192,9 @@ TranslatableString EffectScienFilter::GetDescription() return XO("Performs IIR filtering that emulates analog filters"); } -wxString EffectScienFilter::ManualPage() +ManualPageID EffectScienFilter::ManualPage() { - return wxT("Classic_Filters"); + return L"Classic_Filters"; } diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h index 5dda1f953..7ba840665 100644 --- a/src/effects/ScienFilter.h +++ b/src/effects/ScienFilter.h @@ -41,7 +41,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Silence.cpp b/src/effects/Silence.cpp index a5191c585..cb513cf9c 100644 --- a/src/effects/Silence.cpp +++ b/src/effects/Silence.cpp @@ -50,9 +50,9 @@ TranslatableString EffectSilence::GetDescription() return XO("Creates audio of zero amplitude"); } -wxString EffectSilence::ManualPage() +ManualPageID EffectSilence::ManualPage() { - return wxT("Silence"); + return L"Silence"; } diff --git a/src/effects/Silence.h b/src/effects/Silence.h index 131a50ef9..7596a28ab 100644 --- a/src/effects/Silence.h +++ b/src/effects/Silence.h @@ -29,7 +29,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp index 04e1fe074..455faa102 100644 --- a/src/effects/TimeScale.cpp +++ b/src/effects/TimeScale.cpp @@ -101,9 +101,9 @@ TranslatableString EffectTimeScale::GetDescription() return XO("Allows continuous changes to the tempo and/or pitch"); } -wxString EffectTimeScale::ManualPage() +ManualPageID EffectTimeScale::ManualPage() { - return wxT("Sliding_Stretch"); + return L"Sliding_Stretch"; } // EffectDefinitionInterface implementation diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h index 389fff71f..0e6ef2696 100644 --- a/src/effects/TimeScale.h +++ b/src/effects/TimeScale.h @@ -33,7 +33,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index 288913d0c..f7f93228c 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -139,11 +139,11 @@ TranslatableString EffectToneGen::GetDescription() : XO("Generates a constant frequency tone of one of four types"); } -wxString EffectToneGen::ManualPage() +ManualPageID EffectToneGen::ManualPage() { return mChirp - ? wxT("Chirp") - : wxT("Tone"); + ? L"Chirp" + : L"Tone"; } // EffectDefinitionInterface implementation diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h index c145e9692..c30bf91c3 100644 --- a/src/effects/ToneGen.h +++ b/src/effects/ToneGen.h @@ -28,7 +28,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index d45742025..bd7878df3 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -168,9 +168,9 @@ TranslatableString EffectTruncSilence::GetDescription() return XO("Automatically reduces the length of passages where the volume is below a specified level"); } -wxString EffectTruncSilence::ManualPage() +ManualPageID EffectTruncSilence::ManualPage() { - return wxT("Truncate_Silence"); + return L"Truncate_Silence"; } // EffectDefinitionInterface implementation diff --git a/src/effects/TruncSilence.h b/src/effects/TruncSilence.h index 4bbb7d934..fa8a24996 100644 --- a/src/effects/TruncSilence.h +++ b/src/effects/TruncSilence.h @@ -38,7 +38,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index cf037f442..b8b3234cb 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -106,9 +106,9 @@ TranslatableString EffectWahwah::GetDescription() return XO("Rapid tone quality variations, like that guitar sound so popular in the 1970's"); } -wxString EffectWahwah::ManualPage() +ManualPageID EffectWahwah::ManualPage() { - return wxT("Wahwah"); + return L"Wahwah"; } // EffectDefinitionInterface implementation diff --git a/src/effects/Wahwah.h b/src/effects/Wahwah.h index 67eb5a675..2bce0895e 100644 --- a/src/effects/Wahwah.h +++ b/src/effects/Wahwah.h @@ -48,7 +48,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString ManualPage() override; + ManualPageID ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 345080b22..0c98a509a 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -239,14 +239,14 @@ TranslatableString NyquistEffect::GetDescription() return mCopyright; } -wxString NyquistEffect::ManualPage() +ManualPageID NyquistEffect::ManualPage() { return mIsPrompt ? wxString("Nyquist_Prompt") : mManPage; } -wxString NyquistEffect::HelpPage() +FilePath NyquistEffect::HelpPage() { auto paths = NyquistEffect::GetNyquistSearchPath(); wxString fileName; diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h index 8acbd3174..b621d62a4 100644 --- a/src/effects/nyquist/Nyquist.h +++ b/src/effects/nyquist/Nyquist.h @@ -79,8 +79,8 @@ public: wxString GetVersion() override; TranslatableString GetDescription() override; - wxString ManualPage() override; - wxString HelpPage() override; + ManualPageID ManualPage() override; + FilePath HelpPage() override; // EffectDefinitionInterface implementation diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp index dad943271..48be098de 100644 --- a/src/menus/HelpMenus.cpp +++ b/src/menus/HelpMenus.cpp @@ -100,11 +100,11 @@ public: void PopulateOrExchange(ShuttleGui & S); void AddStuck( ShuttleGui & S, bool & bBool, const PrefSetter &prefSetter, - const TranslatableString &Prompt, wxString Help ); + const TranslatableString &Prompt, const ManualPageID &Help ); void OnOk(wxCommandEvent &event); void OnCancel(wxCommandEvent &event); - void OnHelp(const wxString &Str); + void OnHelp(const ManualPageID &Str); void OnFix(const PrefSetter &setter, wxWindowID id); AudacityProject &mProject; @@ -154,7 +154,7 @@ QuickFixDialog::QuickFixDialog(wxWindow * pParent, AudacityProject &project) : void QuickFixDialog::AddStuck( ShuttleGui & S, bool & bBool, const PrefSetter &prefSetter, - const TranslatableString &Prompt, wxString Help ) + const TranslatableString &Prompt, const ManualPageID &Help ) { mItem++; wxWindowID id = FixButtonID + mItem; @@ -266,7 +266,7 @@ void QuickFixDialog::OnCancel(wxCommandEvent &event) EndModal(wxID_CANCEL); } -void QuickFixDialog::OnHelp(const wxString &Str) +void QuickFixDialog::OnHelp(const ManualPageID &Str) { HelpSystem::ShowHelp(this, Str, true); } diff --git a/src/prefs/ApplicationPrefs.cpp b/src/prefs/ApplicationPrefs.cpp index 1de5e2981..6cc080a4c 100644 --- a/src/prefs/ApplicationPrefs.cpp +++ b/src/prefs/ApplicationPrefs.cpp @@ -47,7 +47,7 @@ TranslatableString ApplicationPrefs::GetDescription() return XO("Preferences for Application"); } -wxString ApplicationPrefs::HelpPageName() +ManualPageID ApplicationPrefs::HelpPageName() { return "Application_Preferences"; } diff --git a/src/prefs/ApplicationPrefs.h b/src/prefs/ApplicationPrefs.h index dfa52ebb3..ed5db513f 100644 --- a/src/prefs/ApplicationPrefs.h +++ b/src/prefs/ApplicationPrefs.h @@ -27,7 +27,7 @@ class ApplicationPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; private: void Populate(); diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp index aac6f98ef..c0332c89a 100644 --- a/src/prefs/BatchPrefs.cpp +++ b/src/prefs/BatchPrefs.cpp @@ -45,7 +45,7 @@ TranslatableString BatchPrefs::GetDescription() return XO("Preferences for Batch"); } -wxString BatchPrefs::HelpPageName() +ManualPageID BatchPrefs::HelpPageName() { return "Batch_Preferences"; } diff --git a/src/prefs/BatchPrefs.h b/src/prefs/BatchPrefs.h index 4be21e6fa..a4e1a3dad 100644 --- a/src/prefs/BatchPrefs.h +++ b/src/prefs/BatchPrefs.h @@ -27,7 +27,7 @@ public: ~BatchPrefs(); ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; bool Commit() override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index b29d0054e..6586c0906 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -74,7 +74,7 @@ TranslatableString DevicePrefs::GetDescription() return XO("Preferences for Device"); } -wxString DevicePrefs::HelpPageName() +ManualPageID DevicePrefs::HelpPageName() { return "Devices_Preferences"; } diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h index 9a25d71bc..543071410 100644 --- a/src/prefs/DevicePrefs.h +++ b/src/prefs/DevicePrefs.h @@ -30,7 +30,7 @@ class DevicePrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp index df35245e6..880b1afb2 100644 --- a/src/prefs/DirectoriesPrefs.cpp +++ b/src/prefs/DirectoriesPrefs.cpp @@ -163,7 +163,7 @@ TranslatableString DirectoriesPrefs::GetDescription() return XO("Preferences for Directories"); } -wxString DirectoriesPrefs::HelpPageName() +ManualPageID DirectoriesPrefs::HelpPageName() { return "Directories_Preferences"; } diff --git a/src/prefs/DirectoriesPrefs.h b/src/prefs/DirectoriesPrefs.h index db3a5e94c..d8348a4a6 100644 --- a/src/prefs/DirectoriesPrefs.h +++ b/src/prefs/DirectoriesPrefs.h @@ -31,7 +31,7 @@ class DirectoriesPrefs final : public PrefsPanel bool Commit() override; bool Validate() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui &S) override; private: diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index 2bc0f47c6..d1eeaaae2 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -48,7 +48,7 @@ TranslatableString EffectsPrefs::GetDescription() return XO("Preferences for Effects"); } -wxString EffectsPrefs::HelpPageName() +ManualPageID EffectsPrefs::HelpPageName() { return "Effects_Preferences"; } diff --git a/src/prefs/EffectsPrefs.h b/src/prefs/EffectsPrefs.h index 41f3acca0..615780cbd 100644 --- a/src/prefs/EffectsPrefs.h +++ b/src/prefs/EffectsPrefs.h @@ -31,7 +31,7 @@ class EffectsPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index b2898d400..29310c011 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -84,7 +84,7 @@ TranslatableString ExtImportPrefs::GetDescription() return XO("Preferences for ExtImport"); } -wxString ExtImportPrefs::HelpPageName() +ManualPageID ExtImportPrefs::HelpPageName() { return "Extended_Import_Preferences"; } diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h index 8272b9fb6..7b0ccc35c 100644 --- a/src/prefs/ExtImportPrefs.h +++ b/src/prefs/ExtImportPrefs.h @@ -55,7 +55,7 @@ class ExtImportPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; // See bug #2315 for discussion. This should be reviewed diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index 82937f3a7..b5e531ceb 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -56,7 +56,7 @@ TranslatableString GUIPrefs::GetDescription() return XO("Preferences for GUI"); } -wxString GUIPrefs::HelpPageName() +ManualPageID GUIPrefs::HelpPageName() { return "Interface_Preferences"; } diff --git a/src/prefs/GUIPrefs.h b/src/prefs/GUIPrefs.h index 115fe319b..6a2c6e5f7 100644 --- a/src/prefs/GUIPrefs.h +++ b/src/prefs/GUIPrefs.h @@ -31,7 +31,7 @@ class AUDACITY_DLL_API GUIPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; static void GetRangeChoices( diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp index 86b12b3b1..e573969f4 100644 --- a/src/prefs/ImportExportPrefs.cpp +++ b/src/prefs/ImportExportPrefs.cpp @@ -43,7 +43,7 @@ TranslatableString ImportExportPrefs::GetDescription() return XO("Preferences for ImportExport"); } -wxString ImportExportPrefs::HelpPageName() +ManualPageID ImportExportPrefs::HelpPageName() { return "Import_-_Export_Preferences"; } diff --git a/src/prefs/ImportExportPrefs.h b/src/prefs/ImportExportPrefs.h index b4d05d3f9..60c46491c 100644 --- a/src/prefs/ImportExportPrefs.h +++ b/src/prefs/ImportExportPrefs.h @@ -36,7 +36,7 @@ class AUDACITY_DLL_API ImportExportPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 1d1def9a3..37e161996 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -117,7 +117,7 @@ TranslatableString KeyConfigPrefs::GetDescription() return XO("Preferences for KeyConfig"); } -wxString KeyConfigPrefs::HelpPageName() +ManualPageID KeyConfigPrefs::HelpPageName() { return "Keyboard_Preferences"; } diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h index d835d49f2..19cb3a3e1 100644 --- a/src/prefs/KeyConfigPrefs.h +++ b/src/prefs/KeyConfigPrefs.h @@ -40,7 +40,7 @@ public: bool Commit() override; void Cancel() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index b185b6cc5..f3cc899db 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -66,7 +66,7 @@ TranslatableString LibraryPrefs::GetDescription() return XO("Preferences for Library"); } -wxString LibraryPrefs::HelpPageName() +ManualPageID LibraryPrefs::HelpPageName() { return "Libraries_Preferences"; } diff --git a/src/prefs/LibraryPrefs.h b/src/prefs/LibraryPrefs.h index b5b091d03..2d9ff1554 100644 --- a/src/prefs/LibraryPrefs.h +++ b/src/prefs/LibraryPrefs.h @@ -33,7 +33,7 @@ class LibraryPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 1d0730168..151bd0ab3 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -75,7 +75,7 @@ TranslatableString MidiIOPrefs::GetDescription() return XO("Preferences for MidiIO"); } -wxString MidiIOPrefs::HelpPageName() +ManualPageID MidiIOPrefs::HelpPageName() { return "MIDI_Devices_Preferences"; } diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index b197332d6..dc5e00e80 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -34,7 +34,7 @@ class MidiIOPrefs final : public PrefsPanel bool Commit() override; bool Validate() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp index ac4f31975..bee5f0013 100644 --- a/src/prefs/ModulePrefs.cpp +++ b/src/prefs/ModulePrefs.cpp @@ -51,7 +51,7 @@ TranslatableString ModulePrefs::GetDescription() return XO("Preferences for Module"); } -wxString ModulePrefs::HelpPageName() +ManualPageID ModulePrefs::HelpPageName() { return "Modules_Preferences"; } diff --git a/src/prefs/ModulePrefs.h b/src/prefs/ModulePrefs.h index 91babf87a..b2bc3ad75 100644 --- a/src/prefs/ModulePrefs.h +++ b/src/prefs/ModulePrefs.h @@ -32,7 +32,7 @@ class ModulePrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp index b7b079caf..a33f3502c 100644 --- a/src/prefs/MousePrefs.cpp +++ b/src/prefs/MousePrefs.cpp @@ -82,7 +82,7 @@ TranslatableString MousePrefs::GetDescription() return XO("Preferences for Mouse"); } -wxString MousePrefs::HelpPageName() +ManualPageID MousePrefs::HelpPageName() { return "Mouse_Preferences"; } diff --git a/src/prefs/MousePrefs.h b/src/prefs/MousePrefs.h index e66de95fe..ff3e5b0d2 100644 --- a/src/prefs/MousePrefs.h +++ b/src/prefs/MousePrefs.h @@ -28,7 +28,7 @@ class MousePrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp index 2af064d32..04f235f3f 100644 --- a/src/prefs/PlaybackPrefs.cpp +++ b/src/prefs/PlaybackPrefs.cpp @@ -47,7 +47,7 @@ TranslatableString PlaybackPrefs::GetDescription() return XO("Preferences for Playback"); } -wxString PlaybackPrefs::HelpPageName() +ManualPageID PlaybackPrefs::HelpPageName() { return "Playback_Preferences"; } diff --git a/src/prefs/PlaybackPrefs.h b/src/prefs/PlaybackPrefs.h index f58e2e798..a5666ee8c 100644 --- a/src/prefs/PlaybackPrefs.h +++ b/src/prefs/PlaybackPrefs.h @@ -29,7 +29,7 @@ class PlaybackPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; static bool GetUnpinnedScrubbingPreference(); diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp index 5db3d0fdb..8d25709d3 100644 --- a/src/prefs/PrefsDialog.cpp +++ b/src/prefs/PrefsDialog.cpp @@ -656,7 +656,7 @@ void PrefsDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) void PrefsDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) { - wxString page = GetCurrentPanel()->HelpPageName(); + const auto &page = GetCurrentPanel()->HelpPageName(); HelpSystem::ShowHelp(this, page, true); } diff --git a/src/prefs/PrefsPanel.cpp b/src/prefs/PrefsPanel.cpp index e4df7904b..5094b5a6a 100644 --- a/src/prefs/PrefsPanel.cpp +++ b/src/prefs/PrefsPanel.cpp @@ -95,9 +95,9 @@ bool PrefsPanel::ShowsPreviewButton() return false; } -wxString PrefsPanel::HelpPageName() +ManualPageID PrefsPanel::HelpPageName() { - return wxEmptyString; + return {}; } PrefsPanel::Factories diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h index bc8cbbd75..dd0663918 100644 --- a/src/prefs/PrefsPanel.h +++ b/src/prefs/PrefsPanel.h @@ -115,9 +115,9 @@ class AUDACITY_DLL_API PrefsPanel /* not final */ virtual bool ShowsPreviewButton(); virtual void PopulateOrExchange( ShuttleGui & WXUNUSED(S) ){}; - // If not empty string, the Help button is added below the panel - // Default returns empty string. - virtual wxString HelpPageName(); + //! If not empty string, the Help button is added below the panel + /*! Default returns empty string. */ + virtual ManualPageID HelpPageName(); virtual void Cancel(); }; diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp index f625d3877..d9698c4cc 100644 --- a/src/prefs/QualityPrefs.cpp +++ b/src/prefs/QualityPrefs.cpp @@ -57,7 +57,7 @@ TranslatableString QualityPrefs::GetDescription() return XO("Preferences for Quality"); } -wxString QualityPrefs::HelpPageName() +ManualPageID QualityPrefs::HelpPageName() { return "Quality_Preferences"; } diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h index ed66d4d63..8208d3f68 100644 --- a/src/prefs/QualityPrefs.h +++ b/src/prefs/QualityPrefs.h @@ -34,7 +34,7 @@ class AUDACITY_DLL_API QualityPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 4b9e50c96..0e0bf00e7 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -62,7 +62,7 @@ TranslatableString RecordingPrefs::GetDescription() return XO("Preferences for Recording"); } -wxString RecordingPrefs::HelpPageName() +ManualPageID RecordingPrefs::HelpPageName() { return "Recording_Preferences"; } diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h index b3952a4c6..950a99a16 100644 --- a/src/prefs/RecordingPrefs.h +++ b/src/prefs/RecordingPrefs.h @@ -48,7 +48,7 @@ class RecordingPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; void PopulateOrExchange(ShuttleGui & S) override; private: diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index b1b851b11..1dd719079 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -77,7 +77,7 @@ TranslatableString SpectrumPrefs::GetDescription() return XO("Preferences for Spectrum"); } -wxString SpectrumPrefs::HelpPageName() +ManualPageID SpectrumPrefs::HelpPageName() { // Currently (May2017) Spectrum Settings is the only preferences // we ever display in a dialog on its own without others. diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index 548473011..d845f58b3 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -53,7 +53,7 @@ class SpectrumPrefs final : public PrefsPanel void Rollback(); bool ShowsPreviewButton() override; bool Validate() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; private: void Populate(size_t windowSize); diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp index 5ccb2a678..cd3e81907 100644 --- a/src/prefs/ThemePrefs.cpp +++ b/src/prefs/ThemePrefs.cpp @@ -82,7 +82,7 @@ TranslatableString ThemePrefs::GetDescription() return XO("Preferences for Theme"); } -wxString ThemePrefs::HelpPageName() +ManualPageID ThemePrefs::HelpPageName() { return "Theme_Preferences"; } diff --git a/src/prefs/ThemePrefs.h b/src/prefs/ThemePrefs.h index 9be36ded8..474e77132 100644 --- a/src/prefs/ThemePrefs.h +++ b/src/prefs/ThemePrefs.h @@ -36,7 +36,7 @@ class ThemePrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; static void ApplyUpdatedImages(); diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 153c92c7c..3f01c3701 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -41,7 +41,7 @@ TranslatableString TracksBehaviorsPrefs::GetDescription() return XO("Preferences for TracksBehaviors"); } -wxString TracksBehaviorsPrefs::HelpPageName() +ManualPageID TracksBehaviorsPrefs::HelpPageName() { return "Tracks_Behaviors_Preferences"; } diff --git a/src/prefs/TracksBehaviorsPrefs.h b/src/prefs/TracksBehaviorsPrefs.h index 06bf46b3b..9f4d80293 100644 --- a/src/prefs/TracksBehaviorsPrefs.h +++ b/src/prefs/TracksBehaviorsPrefs.h @@ -30,7 +30,7 @@ class AUDACITY_DLL_API TracksBehaviorsPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; static const wxChar *ScrollingPreferenceKey(); static inline bool ScrollingPreferenceDefault() { return false; } diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index f65fcd0a4..39b1dcb63 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -288,7 +288,7 @@ TranslatableString TracksPrefs::GetDescription() return XO("Preferences for Tracks"); } -wxString TracksPrefs::HelpPageName() +ManualPageID TracksPrefs::HelpPageName() { return "Tracks_Preferences"; } diff --git a/src/prefs/TracksPrefs.h b/src/prefs/TracksPrefs.h index 63c6ea25e..769be46b8 100644 --- a/src/prefs/TracksPrefs.h +++ b/src/prefs/TracksPrefs.h @@ -33,7 +33,7 @@ class AUDACITY_DLL_API TracksPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; static bool GetPinnedHeadPreference(); static void SetPinnedHeadPreference(bool value, bool flush = false); diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp index 5dc25952d..3d29594c8 100644 --- a/src/prefs/WarningsPrefs.cpp +++ b/src/prefs/WarningsPrefs.cpp @@ -47,7 +47,7 @@ TranslatableString WarningsPrefs::GetDescription() return XO("Preferences for Warnings"); } -wxString WarningsPrefs::HelpPageName() +ManualPageID WarningsPrefs::HelpPageName() { return "Warnings_Preferences"; } diff --git a/src/prefs/WarningsPrefs.h b/src/prefs/WarningsPrefs.h index d6064756a..77bf93e56 100644 --- a/src/prefs/WarningsPrefs.h +++ b/src/prefs/WarningsPrefs.h @@ -30,7 +30,7 @@ class WarningsPrefs final : public PrefsPanel TranslatableString GetDescription() override; bool Commit() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; private: void Populate(); diff --git a/src/prefs/WaveformPrefs.cpp b/src/prefs/WaveformPrefs.cpp index 395b18b24..3574c4d85 100644 --- a/src/prefs/WaveformPrefs.cpp +++ b/src/prefs/WaveformPrefs.cpp @@ -66,7 +66,7 @@ TranslatableString WaveformPrefs::GetDescription() return XO("Preferences for Waveforms"); } -wxString WaveformPrefs::HelpPageName() +ManualPageID WaveformPrefs::HelpPageName() { return "Waveform_Preferences"; } diff --git a/src/prefs/WaveformPrefs.h b/src/prefs/WaveformPrefs.h index 93a5207f9..46342f56a 100644 --- a/src/prefs/WaveformPrefs.h +++ b/src/prefs/WaveformPrefs.h @@ -30,7 +30,7 @@ public: virtual ~WaveformPrefs(); ComponentInterfaceSymbol GetSymbol() override; TranslatableString GetDescription() override; - wxString HelpPageName() override; + ManualPageID HelpPageName() override; bool Commit() override; bool ShowsPreviewButton() override; diff --git a/src/tracks/ui/CommonTrackControls.cpp b/src/tracks/ui/CommonTrackControls.cpp index 6c5c217e3..e67b16cd7 100644 --- a/src/tracks/ui/CommonTrackControls.cpp +++ b/src/tracks/ui/CommonTrackControls.cpp @@ -203,7 +203,7 @@ public: //bool Apply(const CommandContext & context) override; // Provide an override, if we want the help button. - // wxString ManualPage() override {return wxT("");}; + // ManualPageID ManualPage() override {return {};} public: wxString mName; }; diff --git a/src/widgets/ErrorDialog.cpp b/src/widgets/ErrorDialog.cpp index ac0473571..b0ba0a1cc 100644 --- a/src/widgets/ErrorDialog.cpp +++ b/src/widgets/ErrorDialog.cpp @@ -52,7 +52,7 @@ ErrorDialog::ErrorDialog( wxWindow *parent, const TranslatableString & dlogTitle, const TranslatableString & message, - const wxString & helpPage, + const ManualPageID & helpPage, const wxString & log, const bool Close, const bool modal) : wxDialogWrapper(parent, wxID_ANY, dlogTitle, @@ -152,7 +152,7 @@ void ErrorDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) void ShowErrorDialog(wxWindow *parent, const TranslatableString &dlogTitle, const TranslatableString &message, - const wxString &helpPage, + const ManualPageID &helpPage, const bool Close, const wxString &log) { @@ -178,7 +178,7 @@ void ShowExceptionDialog( void ShowModelessErrorDialog(wxWindow *parent, const TranslatableString &dlogTitle, const TranslatableString &message, - const wxString &helpPage, + const ManualPageID &helpPage, const bool Close, const wxString &log) { diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index af3ac4fab..77b7c35ee 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -28,14 +28,14 @@ public: ErrorDialog(wxWindow *parent, const TranslatableString & dlogTitle, const TranslatableString & message, - const wxString & helpPage, + const ManualPageID & helpPage, const wxString & log, const bool Close = true, const bool modal = true); virtual ~ErrorDialog(){} private: - wxString dhelpPage; + ManualPageID dhelpPage; bool dClose; bool dModal; @@ -50,7 +50,7 @@ AUDACITY_DLL_API void ShowErrorDialog(wxWindow *parent, const TranslatableString &dlogTitle, const TranslatableString &message, - const wxString &helpPage, + const ManualPageID &helpPage, bool Close = true, const wxString &log = {}); @@ -65,7 +65,7 @@ void ShowExceptionDialog( void ShowModelessErrorDialog(wxWindow *parent, const TranslatableString &dlogTitle, const TranslatableString &message, - const wxString &helpPage, + const ManualPageID &helpPage, bool Close = true, const wxString &log = {}); diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp index 9898a2ae6..a7fe2db65 100644 --- a/src/widgets/HelpSystem.cpp +++ b/src/widgets/HelpSystem.cpp @@ -307,7 +307,7 @@ void HelpSystem::ShowHelp(wxWindow *parent, } void HelpSystem::ShowHelp(wxWindow *parent, - const wxString &PageName, + const ManualPageID &PageName, bool bModal) { FilePath localHelpPage; diff --git a/src/widgets/HelpSystem.h b/src/widgets/HelpSystem.h index 1493e612d..d22db38fb 100644 --- a/src/widgets/HelpSystem.h +++ b/src/widgets/HelpSystem.h @@ -88,7 +88,7 @@ public: /// @param bModal Whether the resulting dialogue should be modal or not. /// Default is modeless dialogue static void ShowHelp(wxWindow *parent, - const wxString &PageName, + const ManualPageID &PageName, bool bModal = false); /// Hostname (domain name including subdomain) of the server on which the diff --git a/src/widgets/MultiDialog.cpp b/src/widgets/MultiDialog.cpp index 68f55aed4..1cd2923c5 100644 --- a/src/widgets/MultiDialog.cpp +++ b/src/widgets/MultiDialog.cpp @@ -59,7 +59,7 @@ private: void OnHelp(wxCommandEvent& event); wxRadioBox* mRadioBox; - wxString mHelpPage; + ManualPageID mHelpPage; DECLARE_EVENT_TABLE() };