From ae2f68504f5673307dfab2155aa2b06136348e89 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 28 Oct 2015 18:34:02 +0100
Subject: [PATCH] Remove UserControl style.

It is styled as a ContentControl.
---
 src/Perspex.Themes.Default/DefaultTheme.paml        |  1 -
 .../Perspex.Themes.Default.csproj                   |  3 +++
 src/Perspex.Themes.Default/UserControl.paml         | 13 -------------
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 src/Perspex.Themes.Default/UserControl.paml

diff --git a/src/Perspex.Themes.Default/DefaultTheme.paml b/src/Perspex.Themes.Default/DefaultTheme.paml
index 8b93fc4321..ca8147b6e8 100644
--- a/src/Perspex.Themes.Default/DefaultTheme.paml
+++ b/src/Perspex.Themes.Default/DefaultTheme.paml
@@ -24,6 +24,5 @@
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ToggleButton.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.TreeView.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.TreeViewItem.paml"/>
-  <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.UserControl.paml"/>
   <StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.Window.paml"/>
 </Styles>
diff --git a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
index c17244d8ec..800cc0a1b6 100644
--- a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
+++ b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
@@ -140,6 +140,9 @@
     <EmbeddedResource Include="ProgressBar.paml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControl.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <EmbeddedResource Include="PopupRoot.paml">
       <SubType>Designer</SubType>
diff --git a/src/Perspex.Themes.Default/UserControl.paml b/src/Perspex.Themes.Default/UserControl.paml
deleted file mode 100644
index 2d6cb7c4fb..0000000000
--- a/src/Perspex.Themes.Default/UserControl.paml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Style xmlns="https://github.com/perspex" Selector="UserControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-        <ContentPresenter Name="PART_ContentPresenter" 
-                          Content="{TemplateBinding Content}" 
-                          Margin="{TemplateBinding Padding}"/>
-      </Border>
-    </ControlTemplate>
-  </Setter>
-</Style>
\ No newline at end of file