github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-11 07:46:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace wstring used in public methods by Platform::String in CalcViewModel (#768)

Browse source
This commit is contained in:
Rudy Huyn 2019-11-05 13:57:48 -08:00 • committed by GitHub
parent 049d3f4c6c
commit 136ade6aa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 536 additions and 553 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/CalcViewModel/HistoryViewModel.cpp
View file

@ -164,7 +164,11 @@ void HistoryViewModel::OnClearCommand(_In_ Platform::Object ^ e)
UpdateItemSize();
}
MakeHistoryClearedNarratorAnnouncement(HistoryResourceKeys::HistoryCleared, m_localizedHistoryCleared);
if (m_localizedHistoryCleared == nullptr)
{
m_localizedHistoryCleared = AppResourceProvider::GetInstance()->GetResourceString(HistoryResourceKeys::HistoryCleared);
}
HistoryAnnouncement = CalculatorAnnouncement::GetHistoryClearedAnnouncement(m_localizedHistoryCleared);
}
}
@ -370,10 +374,3 @@ void HistoryViewModel::UpdateItemSize()
{
ItemSize = Items->Size;
}
void HistoryViewModel::MakeHistoryClearedNarratorAnnouncement(String ^ resourceKey, String ^ &formatVariable)
{
String ^ announcement = LocalizationStringUtil::GetLocalizedNarratorAnnouncement(resourceKey, formatVariable);
HistoryAnnouncement = CalculatorAnnouncement::GetHistoryClearedAnnouncement(announcement);
}