Browse Source

PropertyGrid: removed IEditorDefinition interface.

pull/1645/head
brianlagunas_cp 15 years ago
parent
commit
bafa2e2702
  1. 2
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
  2. 6
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
  3. 2
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
  4. 1
      ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj

2
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs

@ -3,7 +3,7 @@ using System.Windows;
namespace Microsoft.Windows.Controls.PropertyGrid namespace Microsoft.Windows.Controls.PropertyGrid
{ {
public class EditorDefinition : IEditorDefinition public class EditorDefinition
{ {
public DataTemplate EditorTemplate { get; set; } public DataTemplate EditorTemplate { get; set; }

6
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs

@ -4,9 +4,9 @@ using System.Collections.ObjectModel;
namespace Microsoft.Windows.Controls.PropertyGrid namespace Microsoft.Windows.Controls.PropertyGrid
{ {
public class EditorDefinitionCollection : ObservableCollection<IEditorDefinition> public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
{ {
public IEditorDefinition this[string propertyName] public EditorDefinition this[string propertyName]
{ {
get get
{ {
@ -20,7 +20,7 @@ namespace Microsoft.Windows.Controls.PropertyGrid
} }
} }
public IEditorDefinition this[Type targetType] public EditorDefinition this[Type targetType]
{ {
get get
{ {

2
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs

@ -128,7 +128,7 @@ namespace Microsoft.Windows.Controls.PropertyGrid
if (customTypeEditors.Count > 0) if (customTypeEditors.Count > 0)
{ {
//first check if the custom editor is type based //first check if the custom editor is type based
IEditorDefinition customEditor = customTypeEditors[propertyItem.PropertyType]; EditorDefinition customEditor = customTypeEditors[propertyItem.PropertyType];
if (customEditor == null) if (customEditor == null)
{ {
//must be property based //must be property based

1
ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj

@ -261,7 +261,6 @@
<Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" /> <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
<Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceEditor.cs" /> <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceEditor.cs" />
<Compile Include="PropertyGrid\Implementation\Editors\TimeSpanEditor.cs" /> <Compile Include="PropertyGrid\Implementation\Editors\TimeSpanEditor.cs" />
<Compile Include="PropertyGrid\Implementation\IEditorDefinition.cs" />
<Compile Include="PropertyGrid\Implementation\Editors\IntegerUpDownEditor.cs" /> <Compile Include="PropertyGrid\Implementation\Editors\IntegerUpDownEditor.cs" />
<Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" /> <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
<Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" /> <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />

Loading…
Cancel
Save