merge changes from icsharpcode/ILSpy

Author: siegfriedpammer

ICSharpCode.AvalonEdit/Search/SearchCommands.cs

@@ -83,6 +83,13 @@ internal SearchInputHandler(TextArea textArea, SearchPanel panel)
 			this.panel = panel;
 		}
 
+		internal void RegisterGlobalCommands(CommandBindingCollection commandBindings)
+		{
+			commandBindings.Add(new CommandBinding(ApplicationCommands.Find, ExecuteFind));
+			commandBindings.Add(new CommandBinding(SearchCommands.FindNext, ExecuteFindNext, CanExecuteWithOpenSearchPanel));
+			commandBindings.Add(new CommandBinding(SearchCommands.FindPrevious, ExecuteFindPrevious, CanExecuteWithOpenSearchPanel));
+		}
+
 		void RegisterCommands(ICollection<CommandBinding> commandBindings)
 		{
 			commandBindings.Add(new CommandBinding(ApplicationCommands.Find, ExecuteFind));

ICSharpCode.AvalonEdit/Search/SearchPanel.cs

@@ -218,6 +218,14 @@ public static SearchPanel Install(TextArea textArea)
 			textArea.DefaultInputHandler.NestedInputHandlers.Add(panel.handler);
 			return panel;
 		}
+
+		/// <summary>
+		/// Adds the commands used by SearchPanel to the given CommandBindingCollection.
+		/// </summary>
+		public void RegisterCommands(CommandBindingCollection commandBindings)
+		{
+			handler.RegisterGlobalCommands(commandBindings);
+		}
 
 		/// <summary>
 		/// Removes the SearchPanel from the TextArea.
@@ -413,7 +421,11 @@ public void Close()
 			renderer.CurrentResults.Clear();
 		}
 
-		void CloseAndRemove()
+		/// <summary>
+		/// Closes the SearchPanel and removes it.
+		/// </summary>
+		[Obsolete("Use the Uninstall method instead!")]
+		public void CloseAndRemove()
 		{
 			Close();
 			textArea.DocumentChanged -= textArea_DocumentChanged;