From 3010bc76fbab16fedb85f9b132fc108a0b545cec Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 28 Jul 2015 21:34:39 +0200
Subject: [PATCH] Use IItemContainerGenerator interface.

Instead of ItemContainerGenerator  class.
---
 Perspex.Controls/ItemsControl.cs             | 5 ++---
 Perspex.Controls/ListBox.cs                  | 2 +-
 Perspex.Controls/Presenters/DeckPresenter.cs | 2 +-
 Perspex.Controls/Primitives/TabStrip.cs      | 4 ++--
 Perspex.Controls/TreeView.cs                 | 2 +-
 Perspex.Controls/TreeViewItem.cs             | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Perspex.Controls/ItemsControl.cs b/Perspex.Controls/ItemsControl.cs
index 340c5cca45..aca64b2ea3 100644
--- a/Perspex.Controls/ItemsControl.cs
+++ b/Perspex.Controls/ItemsControl.cs
@@ -31,7 +31,7 @@ namespace Perspex.Controls
         public static readonly PerspexProperty<ItemsPanelTemplate> ItemsPanelProperty =
             PerspexProperty.Register<ItemsControl, ItemsPanelTemplate>("ItemsPanel", defaultValue: DefaultPanel);
 
-        private ItemContainerGenerator itemContainerGenerator;
+        private IItemContainerGenerator itemContainerGenerator;
 
         private PerspexReadOnlyListView<IVisual, ILogical> logicalChildren = 
             new PerspexReadOnlyListView<IVisual, ILogical>(x => (ILogical)x);
@@ -52,7 +52,6 @@ namespace Perspex.Controls
             this.ItemsChanged(null, null);
         }
 
-        public ItemContainerGenerator ItemContainerGenerator
         {
             get
             {
@@ -100,7 +99,7 @@ namespace Perspex.Controls
             }
         }
 
-        protected virtual ItemContainerGenerator CreateItemContainerGenerator()
+        protected virtual IItemContainerGenerator CreateItemContainerGenerator()
         {
             return new ItemContainerGenerator(this);
         }
diff --git a/Perspex.Controls/ListBox.cs b/Perspex.Controls/ListBox.cs
index 2a98e7bf56..d085b38b61 100644
--- a/Perspex.Controls/ListBox.cs
+++ b/Perspex.Controls/ListBox.cs
@@ -11,7 +11,7 @@ namespace Perspex.Controls
 
     public class ListBox : SelectingItemsControl
     {
-        protected override ItemContainerGenerator CreateItemContainerGenerator()
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
             return new TypedItemContainerGenerator<ListBoxItem>(this);
         }
diff --git a/Perspex.Controls/Presenters/DeckPresenter.cs b/Perspex.Controls/Presenters/DeckPresenter.cs
index c445035845..f39d0b38e3 100644
--- a/Perspex.Controls/Presenters/DeckPresenter.cs
+++ b/Perspex.Controls/Presenters/DeckPresenter.cs
@@ -38,7 +38,7 @@ namespace Perspex.Controls.Presenters
             this.GetObservableWithHistory(SelectedItemProperty).Subscribe(this.SelectedItemChanged);
         }
 
-        public ItemContainerGenerator ItemContainerGenerator
+        public IItemContainerGenerator ItemContainerGenerator
         {
             get;
             private set;
diff --git a/Perspex.Controls/Primitives/TabStrip.cs b/Perspex.Controls/Primitives/TabStrip.cs
index 9d26214caa..22c64359eb 100644
--- a/Perspex.Controls/Primitives/TabStrip.cs
+++ b/Perspex.Controls/Primitives/TabStrip.cs
@@ -33,10 +33,10 @@ namespace Perspex.Controls.Primitives
             set { this.SetValue(SelectedTabProperty, value); }
         }
 
-        protected override ItemContainerGenerator CreateItemContainerGenerator()
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
             TabControl tabControl = this.TemplatedParent as TabControl;
-            ItemContainerGenerator result;
+            IItemContainerGenerator result;
 
             if (tabControl != null)
             {
diff --git a/Perspex.Controls/TreeView.cs b/Perspex.Controls/TreeView.cs
index 7fdb9066d2..25b1afa151 100644
--- a/Perspex.Controls/TreeView.cs
+++ b/Perspex.Controls/TreeView.cs
@@ -38,7 +38,7 @@ namespace Perspex.Controls
             set { this.SetValue(SelectedItemProperty, value); }
         }
 
-        protected override ItemContainerGenerator CreateItemContainerGenerator()
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
             return new TreeItemContainerGenerator<TreeViewItem>(this);
         }
diff --git a/Perspex.Controls/TreeViewItem.cs b/Perspex.Controls/TreeViewItem.cs
index fe98cd4e79..0f43ef60fe 100644
--- a/Perspex.Controls/TreeViewItem.cs
+++ b/Perspex.Controls/TreeViewItem.cs
@@ -60,7 +60,7 @@ namespace Perspex.Controls
         }
 
         /// <inheritdoc/>
-        protected override ItemContainerGenerator CreateItemContainerGenerator()
+        protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
             if (this.treeView == null)
             {