Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-08 20:52:09 +01:00
Code Issues Releases Wiki Activity

Uses of TranslatableString as value of XO macro...

Browse Source 
... 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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/toolbars/ControlToolBar.cpp
View File

@@ -92,7 +92,7 @@ BEGIN_EVENT_TABLE(ControlToolBar, ToolBar)
EVT_IDLE(ControlToolBar::OnIdle)
END_EVENT_TABLE()
static const wxString
static const TranslatableString
sStatePlay = XO("Playing")
, sStateStop = XO("Stopped")
, sStateRecord = XO("Recording")
@@ -712,9 +712,9 @@ wxString ControlToolBar::StateForStatusBar()
auto pProject = &mProject;
auto scrubState = pProject
? Scrubber::Get( *pProject ).GetUntranslatedStateString()
: wxString();
: TranslatableString{};
if (!scrubState.empty())
state = wxGetTranslation(scrubState);
state = scrubState.Translation();
else if (mPlay->IsDown())
state = wxGetTranslation(sStatePlay);
else if (projectAudioManager.Recording())