From c8ee522c4994614939f8186ccdc724a0bf7115be Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 2 Oct 2015 19:04:58 +0200
Subject: [PATCH] Setup TreeDataTemplate Content property.

---
 src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs | 3 ++-
 src/Markup/Perspex.Markup.Xaml/Templates/DataTemplate.cs       | 1 -
 src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
index c5373e031a..e02512fe1e 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
@@ -116,6 +116,7 @@ namespace Perspex.Markup.Xaml.Context
             var contentProperties = new Collection<ContentPropertyDefinition>
             {
                 new ContentPropertyDefinition(typeof(ContentControl), "Content"),
+                new ContentPropertyDefinition(typeof(DataTemplate), "Content"),
                 new ContentPropertyDefinition(typeof(Decorator), "Child"),
                 new ContentPropertyDefinition(typeof(ItemsControl), "Items"),
                 new ContentPropertyDefinition(typeof(GradientBrush), "GradientStops"),
@@ -123,7 +124,7 @@ namespace Perspex.Markup.Xaml.Context
                 new ContentPropertyDefinition(typeof(Style), "Setters"),
                 new ContentPropertyDefinition(typeof(TextBlock), "Text"),
                 new ContentPropertyDefinition(typeof(TextBox), "Text"),
-                new ContentPropertyDefinition(typeof(DataTemplate), "Content"),
+                new ContentPropertyDefinition(typeof(TreeDataTemplate), "Content"),
             };
 
             contentPropertyProvider.AddAll(contentProperties);
diff --git a/src/Markup/Perspex.Markup.Xaml/Templates/DataTemplate.cs b/src/Markup/Perspex.Markup.Xaml/Templates/DataTemplate.cs
index aa07179dac..da22cafae2 100644
--- a/src/Markup/Perspex.Markup.Xaml/Templates/DataTemplate.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/DataTemplate.cs
@@ -8,7 +8,6 @@ using Perspex.Controls.Templates;
 
 namespace Perspex.Markup.Xaml.Templates
 {
-    [ContentProperty("Content")]
     public class DataTemplate : IDataTemplate
     {
         public Type DataType { get; set; }
diff --git a/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
index 23955b7682..44b264897a 100644
--- a/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -10,7 +10,6 @@ using Perspex.Markup.Xaml.Binding;
 
 namespace Perspex.Markup.Xaml.Templates
 {
-    [ContentProperty("Content")]
     public class TreeDataTemplate : ITreeDataTemplate
     {
         public Type DataType { get; set; }