1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00

Uses of TranslatableString as value of XO macro...

... It is not implicitly convertible from wxString, compelling many uses of
the new type to fix compilation.
This commit is contained in:
Paul Licameli
2018-03-29 16:26:31 -04:00
parent 911f5eabcc
commit e4a7c9ba5b
21 changed files with 58 additions and 61 deletions

View File

@@ -16,6 +16,8 @@
#include <utility>
#include <wx/string.h>
#include "audacity/Types.h"
class AudacityProject;
// Increase the template parameter as needed to allow more flags
@@ -42,7 +44,7 @@ struct CommandFlagOptions{
CommandFlagOptions(
const MessageFormatter &message_,
const wxString &helpPage_ = {},
const wxString &title_ = {}
const TranslatableString &title_ = {}
) : message{ message_ }, helpPage{ helpPage_ }, title{ title_ }
{}
@@ -63,7 +65,7 @@ struct CommandFlagOptions{
// Empty, or non-default title for the dialog box when the
// condition is not satisfied for the selected command
// This string must be given UN-translated.
wxString title;
TranslatableString title;
// Conditions with higher "priority" are preferred over others in choosing
// the help message