diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h index 0a5e3758..2e65a700 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.h @@ -57,7 +57,7 @@ namespace CalculatorApp::Common::Automation private: // Make CalculatorAnnouncement a friend class so it is the only // class that can access the private constructor. - friend ref class CalculatorAnnouncement; + friend class CalculatorAnnouncement; NarratorAnnouncement( Platform::String^ announcement, @@ -73,7 +73,7 @@ namespace CalculatorApp::Common::Automation // CalculatorAnnouncement is intended to contain only static methods // that return announcements made for the Calculator app. - public ref class CalculatorAnnouncement sealed + class CalculatorAnnouncement { public: static NarratorAnnouncement^ GetDisplayUpdatedAnnouncement(Platform::String^ announcement); @@ -88,11 +88,7 @@ namespace CalculatorApp::Common::Automation static NarratorAnnouncement^ GetCategoryNameChangedAnnouncement(Platform::String^ announcement); static NarratorAnnouncement^ GetUpdateCurrencyRatesAnnouncement(Platform::String^ announcement); - + static NarratorAnnouncement^ GetDisplayCopiedAnnouncement(Platform::String^ announcement); - - private: - CalculatorAnnouncement() { } }; - } diff --git a/src/Calculator/Views/DateCalculator.xaml.cpp b/src/Calculator/Views/DateCalculator.xaml.cpp index 6c19b3ca..14269260 100644 --- a/src/Calculator/Views/DateCalculator.xaml.cpp +++ b/src/Calculator/Views/DateCalculator.xaml.cpp @@ -209,7 +209,7 @@ void DateCalculator::ReselectCalendarDate(_In_ Windows::UI::Xaml::Controls::Cale void DateCalculator::OffsetDropDownClosed(_In_ Object^ sender, _In_ Object^ e) { - RaiseLiveRegionChangedAutomationEvent(false); + RaiseLiveRegionChangedAutomationEvent(/* DateDiff mode */ false); } void DateCalculator::CalendarFlyoutClosed(_In_ Object^ sender, _In_ Object^ e) @@ -227,5 +227,5 @@ void DateCalculator::RaiseLiveRegionChangedAutomationEvent(_In_ bool isDateDiffM void CalculatorApp::DateCalculator::AddSubtractOption_Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) { - RaiseLiveRegionChangedAutomationEvent(false); + RaiseLiveRegionChangedAutomationEvent(/* DateDiff mode */ false); } diff --git a/src/Calculator/Views/DateCalculator.xaml.h b/src/Calculator/Views/DateCalculator.xaml.h index 65cdfa6f..3d825d08 100644 --- a/src/Calculator/Views/DateCalculator.xaml.h +++ b/src/Calculator/Views/DateCalculator.xaml.h @@ -45,6 +45,5 @@ namespace CalculatorApp void RaiseLiveRegionChangedAutomationEvent(_In_ bool isDateDiffMode); Windows::Foundation::EventRegistrationToken m_dateCalcOptionChangedEventToken; - void AddOption_Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); }; }