From 8211ef5a341b5ba0bcc80278e63c38d2d456d30d Mon Sep 17 00:00:00 2001 From: Jared Henderson Date: Tue, 14 Feb 2017 13:40:33 -0800 Subject: [PATCH] Fixing naming of UIKit.Label helper method: TextBox->TextBlock. --- Frameworks/UIKit.Xaml/Label.xaml.cpp | 2 +- Frameworks/UIKit.Xaml/ObjCXamlControls.h | 2 +- Frameworks/UIKit/XamlControls.mm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Frameworks/UIKit.Xaml/Label.xaml.cpp b/Frameworks/UIKit.Xaml/Label.xaml.cpp index 32c7c6221e..293fd6831a 100644 --- a/Frameworks/UIKit.Xaml/Label.xaml.cpp +++ b/Frameworks/UIKit.Xaml/Label.xaml.cpp @@ -123,7 +123,7 @@ UIKIT_XAML_EXPORT void XamlCreateLabel(IInspectable** created) { } // Retrieves the UIKit::Label's backing TextBlock as an IInspectable -UIKIT_XAML_EXPORT IInspectable* XamlGetLabelTextBox(const Microsoft::WRL::ComPtr& label) { +UIKIT_XAML_EXPORT IInspectable* XamlGetLabelTextBlock(const Microsoft::WRL::ComPtr& label) { auto labelGrid = safe_cast(reinterpret_cast(label.Get())); return InspectableFromObject(labelGrid->TextBlock).Detach(); } diff --git a/Frameworks/UIKit.Xaml/ObjCXamlControls.h b/Frameworks/UIKit.Xaml/ObjCXamlControls.h index cecd3e49ee..08e9538b6d 100644 --- a/Frameworks/UIKit.Xaml/ObjCXamlControls.h +++ b/Frameworks/UIKit.Xaml/ObjCXamlControls.h @@ -59,7 +59,7 @@ UIKIT_XAML_EXPORT void XamlRemoveLayoutEvent(const Microsoft::WRL::ComPtr& label); +UIKIT_XAML_EXPORT IInspectable* XamlGetLabelTextBlock(const Microsoft::WRL::ComPtr& label); //////////////////////////////////////////////////////////////////////////////////// // Layer.xaml.cpp diff --git a/Frameworks/UIKit/XamlControls.mm b/Frameworks/UIKit/XamlControls.mm index 92da5708c4..da9f4d505d 100644 --- a/Frameworks/UIKit/XamlControls.mm +++ b/Frameworks/UIKit/XamlControls.mm @@ -103,7 +103,7 @@ void XamlContentDialogSetDestructiveButtonIndex(WXCContentDialog* contentDialog, } WXCTextBlock* GetLabelTextBlock(WXCGrid* labelGrid) { - Microsoft::WRL::ComPtr inspectable(XamlGetLabelTextBox([labelGrid comObj])); + Microsoft::WRL::ComPtr inspectable(XamlGetLabelTextBlock([labelGrid comObj])); return _createRtProxy([WXCTextBlock class], inspectable.Get()); }