diff options
| author | kingces95 <kingces95@users.noreply.github.com> | 2016-04-12 11:44:30 -0700 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-04-12 11:44:30 -0700 |
| commit | 10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba (patch) | |
| tree | b9bd7f86a3650b2fedcf762b18c25699ff44f82e /Xamarin.Forms.Core/VisualElement.cs | |
| parent | 73defe491f11fc417a22eebcf805ee20df90045a (diff) | |
| download | xamarin-forms-10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba.tar.gz xamarin-forms-10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba.tar.bz2 xamarin-forms-10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba.zip | |
Mop up enabling warnings as errors (#78)
Diffstat (limited to 'Xamarin.Forms.Core/VisualElement.cs')
| -rw-r--r-- | Xamarin.Forms.Core/VisualElement.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Xamarin.Forms.Core/VisualElement.cs b/Xamarin.Forms.Core/VisualElement.cs index 16efe730..c85b379a 100644 --- a/Xamarin.Forms.Core/VisualElement.cs +++ b/Xamarin.Forms.Core/VisualElement.cs @@ -511,7 +511,9 @@ namespace Xamarin.Forms public SizeRequest Measure(double widthConstraint, double heightConstraint, MeasureFlags flags = MeasureFlags.None) { +#pragma warning disable 0618 // retain until GetSizeRequest removed SizeRequest result = GetSizeRequest(widthConstraint, heightConstraint); +#pragma warning restore if ((flags & MeasureFlags.IncludeMargins) != 0) { @@ -577,11 +579,14 @@ namespace Xamarin.Forms protected virtual SizeRequest OnMeasure(double widthConstraint, double heightConstraint) { +#pragma warning disable 0618 // retain until OnSizeRequest removed return OnSizeRequest(widthConstraint, heightConstraint); +#pragma warning restore } protected override void OnParentSet() { +#pragma warning disable 0618 // retain until ParentView removed base.OnParentSet(); if (ParentView != null) @@ -592,6 +597,7 @@ namespace Xamarin.Forms { NavigationProxy.Inner = null; } +#pragma warning restore } protected virtual void OnSizeAllocated(double width, double height) |