Changed CompletionListBox.EmptyTemplate to ContentPresenter. Attempt to provide TextBlock in SharpDevelopCompletionWindow.xaml, but nothing gets displayed.

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

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.cs

@@ -84,7 +84,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
 					this.CompletionList.SelectedItem = adapter;
 			}
 			this.StartOffset -= itemList.PreselectionLength;
-			this.EmptyContent = StringParser.Parse("${res:ICSharpCode.AvalonEdit.AddIn.SharpDevelopCompletionWindow.EmptyText}");
 		}
 		
 		protected override void OnSourceInitialized(EventArgs e)

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/SharpDevelopCompletionWindow.xaml

@@ -3,7 +3,6 @@
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	xmlns:local="clr-namespace:ICSharpCode.AvalonEdit.AddIn"
 >
-	<!-- Attempt to set SharpDevelopCompletionWindow.EmptyContent in xaml
 	<Style TargetType="{x:Type local:SharpDevelopCompletionWindow}">
 		<Setter Property="EmptyContent">
 			<Setter.Value>
@@ -12,5 +11,4 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	-->
 </ResourceDictionary>

src/AddIns/DisplayBindings/AvalonEdit.AddIn/themes/generic.xaml

@@ -3,6 +3,10 @@
 	xmlns:local="clr-namespace:ICSharpCode.AvalonEdit.AddIn"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
 >
+	<ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/ICSharpCode.AvalonEdit.AddIn;component/Src/SharpDevelopCompletionWindow.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+	
 	<Style TargetType="{x:Type local:SharpDevelopTextEditor}">
 		<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
 		<Setter Property="Template">

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.xaml

@@ -65,8 +65,8 @@
 							</DataTemplate>
 						</ItemsControl.ItemTemplate>
 						<cc:CompletionListBox.EmptyTemplate>
-							<!-- This could be a ContentPresenter showing any content, not just TextBlock -->
-							<TextBlock Text="{TemplateBinding EmptyContent}" TextWrapping="Wrap" FontStyle="Italic" Foreground="Gray"></TextBlock>
+							    <!-- EmptyContent provided by user will be displayed in case the list is empty -->
+								<ContentPresenter Content="{TemplateBinding EmptyContent}"></ContentPresenter>
 						</cc:CompletionListBox.EmptyTemplate>
 					</cc:CompletionListBox>
 				</ControlTemplate>

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/CodeCompletion/CompletionWindow.cs

@@ -40,7 +40,6 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
 			// prevent user from resizing window to 0x0
 			this.MinHeight = 15;
 			this.MinWidth = 30;
-			this.EmptyContent = null;
 			
 			toolTip.PlacementTarget = this;
 			toolTip.Placement = PlacementMode.Right;
@@ -56,10 +55,10 @@ namespace ICSharpCode.AvalonEdit.CodeCompletion
 		/// </summary>
 		public object EmptyContent {
 			get { 
-				return this.completionList.EmptyContent; 
+				return this.completionList.EmptyContent;
 			}
 			set { 
-				this.completionList.EmptyContent = value; 
+				this.completionList.EmptyContent = value;
 			}
 		}