Browse Source

Merge pull request #63 from jogibear9988/master

Fix Unit Tests -> ListBox is a ItemsControl and can now get Content!
pull/68/merge 4.3.3
Siegfried Oleg Pammer 12 years ago
parent
commit
463ee0248a
  1. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/EditOperationTests.cs
  2. 8
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/EditOperationTests.cs

@ -70,7 +70,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer @@ -70,7 +70,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
private DesignItem IntializePasteOperationsTest()
{
var grid = CreateGridContextWithDesignSurface("<Button Name=\"TestElement\"/><Grid><Button/></Grid><Window/><ListBox/>");
var grid = CreateGridContextWithDesignSurface("<Button Name=\"TestElement\"/><Grid><Button/></Grid><Window/><Image/>");
Assert.IsNotNull(grid);
var xamlConxtext = grid.Context as XamlDesignContext;
if (xamlConxtext != null) {

8
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs

@ -38,6 +38,14 @@ namespace ICSharpCode.WpfDesign.XamlDom @@ -38,6 +38,14 @@ namespace ICSharpCode.WpfDesign.XamlDom
}
if (newName != null) {
nameScope.RegisterName(newName, namedObject.Instance);
try{
var prp = namedObject.ElementType.GetProperty(namedObject.RuntimeNameProperty);
if (prp != null)
prp.SetValue(namedObject.Instance, newName, null);
} catch (Exception x) {
Debug.WriteLine(x.Message);
}
}
break;
}

Loading…
Cancel
Save