DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into feature/GraphingCalculator branch (#585)

Browse Source 
* Merge master into feature/GraphingCalculator branch
This commit is contained in:
Stephanie Anderl
2019-07-15 11:17:21 -07:00
committed by GitHub
parent 1475b49120
commit a418777f02
447 changed files with 18056 additions and 19323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Calculator/Converters/ExpressionItemTemplateSelector.h
View File

@@ -7,11 +7,10 @@ namespace CalculatorApp
{
namespace Converters
{
[Windows::UI::Xaml::Data::Bindable]
public ref class ExpressionItemTemplateSelector sealed : public Windows::UI::Xaml::Controls::DataTemplateSelector
[Windows::UI::Xaml::Data::Bindable] public ref class ExpressionItemTemplateSelector sealed : public Windows::UI::Xaml::Controls::DataTemplateSelector
{
public:
virtual Windows::UI::Xaml::DataTemplate^ SelectTemplateCore(Platform::Object^ item, Windows::UI::Xaml::DependencyObject^ container) override;
virtual Windows::UI::Xaml::DataTemplate ^ SelectTemplateCore(Platform::Object ^ item, Windows::UI::Xaml::DependencyObject ^ container) override;
property Windows::UI::Xaml::DataTemplate^ OperatorTemplate
{
@@ -51,8 +50,8 @@ namespace CalculatorApp
private:
Windows::UI::Xaml::DataTemplate^ m_operatorTemplate;
Windows::UI::Xaml::DataTemplate^ m_operandTemplate;
Windows::UI::Xaml::DataTemplate^ m_separatorTemplate;
Windows::UI::Xaml::DataTemplate ^ m_operandTemplate;
Windows::UI::Xaml::DataTemplate ^ m_separatorTemplate;
};
}
}