From dd9be602c89b36b898e9cb2178e2dec1c0c8d372 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 23 Jun 2007 12:50:22 +0000 Subject: [PATCH] XamlBinding. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2569 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../XamlBinding/Project/Src/XamlClassReturnType.cs | 2 +- .../XamlBinding/Project/Src/XamlExpressionContext.cs | 4 ++++ .../WpfDesign/StandaloneDesigner/Window1.xaml.cs | 10 +--------- .../Project/Controls/PropertyEditor/PropertyEditor.cs | 10 +--------- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlClassReturnType.cs b/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlClassReturnType.cs index 1cfc23e876..008c417f73 100644 --- a/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlClassReturnType.cs +++ b/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlClassReturnType.cs @@ -25,7 +25,7 @@ namespace XamlBinding throw new ArgumentNullException("compilationUnit"); this.compilationUnit = compilationUnit; - this.xmlNamespace = xmlNamespace ?? ""; + this.xmlNamespace = xmlNamespace; this.className = className ?? ""; } diff --git a/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlExpressionContext.cs b/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlExpressionContext.cs index 20c9164dff..88f370ec06 100644 --- a/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlExpressionContext.cs +++ b/src/AddIns/BackendBindings/XamlBinding/Project/Src/XamlExpressionContext.cs @@ -41,6 +41,10 @@ namespace XamlBinding b.Append("[XamlExpressionContext "); for (int i = 0; i < ElementPath.Elements.Count; i ++) { if (i > 0) b.Append(">"); + if (!string.IsNullOrEmpty(ElementPath.Elements[i].Prefix)) { + b.Append(ElementPath.Elements[i].Prefix); + b.Append(':'); + } b.Append(ElementPath.Elements[i].Name); } if (!string.IsNullOrEmpty(AttributeName)) { diff --git a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs index 1a7b351bd5..266a195bed 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Window1.xaml.cs @@ -34,15 +34,6 @@ namespace StandaloneDesigner } } - #if XAML_DEFINITIONS - // this is not compiled, but gives us code-completion inside SharpDevelop - TextBox CodeTextBox; - DesignSurface designSurface; - PropertyEditor propertyEditor; - ToolBar toolBar; - Toolbox toolbox; - #endif - void tabControlSelectionChanged(object sender, RoutedEventArgs e) { if (e.Source != tabControl) return; @@ -109,3 +100,4 @@ namespace StandaloneDesigner } } } + diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs index 7c52590af3..4732b4008b 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PropertyEditor/PropertyEditor.cs @@ -31,15 +31,6 @@ namespace ICSharpCode.WpfDesign.Designer = DependencyProperty.Register("EditedObject", typeof(IPropertyEditorDataSource), typeof(PropertyEditor), new FrameworkPropertyMetadata(null, _OnEditedObjectPropertyChanged)); - #if XAML_DEFINITIONS - // this is not compiled, but gives us code-completion inside SharpDevelop - TextBox nameTextBox; - Label typeLabel; - Rectangle componentImage; - TextBox searchTextBox; - StackPanel contentStackPanel; - #endif - /// /// Creates a new PropertyGrid instance. /// @@ -180,3 +171,4 @@ namespace ICSharpCode.WpfDesign.Designer } } } +