1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-07 20:22:13 +01:00

Conversion of TranslatableString to wxString is private

This commit is contained in:
Paul Licameli
2019-11-30 13:32:18 -05:00
parent 0b6618e491
commit 72df562c4a
30 changed files with 119 additions and 99 deletions

View File

@@ -687,14 +687,14 @@ registeredStatusWidthFunction{
-> ProjectStatus::StatusWidthResult
{
if ( field == stateStatusBarField ) {
const auto pauseString = wxT(" ") + GetCustomTranslation(sStatePause);
const auto pauseString = wxT(" ") + sStatePause.Translation();
std::vector<wxString> strings;
for ( auto pString :
{ &sStatePlay, &sStateStop, &sStateRecord } )
{
strings.push_back(
GetCustomTranslation(*pString) + pauseString + wxT(".") );
pString->Translation() + pauseString + wxT(".") );
}
// added constant needed because xMax isn't large enough for some reason, plus some space.
@@ -716,16 +716,16 @@ wxString ControlToolBar::StateForStatusBar()
if (!scrubState.empty())
state = scrubState.Translation();
else if (mPlay->IsDown())
state = wxGetTranslation(sStatePlay);
state = sStatePlay.Translation();
else if (projectAudioManager.Recording())
state = wxGetTranslation(sStateRecord);
state = sStateRecord.Translation();
else
state = wxGetTranslation(sStateStop);
state = sStateStop.Translation();
if (mPause->IsDown())
{
state.Append(wxT(" "));
state.Append(wxGetTranslation(sStatePause));
state.Append(sStatePause.Translation());
}
state.Append(wxT("."));