XamlBinding.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2569 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

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 ?? "";
 		}
 		

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)) {

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
 		}
 	}
 }
+

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
-		
 		/// <summary>
 		/// Creates a new PropertyGrid instance.
 		/// </summary>
@@ -180,3 +171,4 @@ namespace ICSharpCode.WpfDesign.Designer
 		}
 	}
 }
+