From 103aff08054a2dccd498178d73ac502cbd30f506 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Thu, 25 Jul 2013 13:23:14 +0200
Subject: [PATCH] Set e.Handled = true in SharpTreeView.OnKeyDown()

---
 .../SharpTreeView/ICSharpCode.TreeView/SharpTreeView.cs     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeView.cs b/src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeView.cs
index 5e1f073eea..861b782ba5 100644
--- a/src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeView.cs
+++ b/src/Libraries/SharpTreeView/ICSharpCode.TreeView/SharpTreeView.cs
@@ -240,16 +240,20 @@ namespace ICSharpCode.TreeView
 					break;
 				case Key.Return:
 					if (container != null && Keyboard.Modifiers == ModifierKeys.None && this.SelectedItems.Count == 1 && this.SelectedItem == container.Node) {
+						e.Handled = true;
 						container.Node.ActivateItem(e);
 					}
 					break;
 				case Key.Space:
 					if (container != null && Keyboard.Modifiers == ModifierKeys.None && this.SelectedItems.Count == 1 && this.SelectedItem == container.Node) {
-						if(container.Node.IsCheckable) {
+						e.Handled = true;
+						if (container.Node.IsCheckable) {
 							if(container.Node.IsChecked == null) // If partially selected, we want to select everything
 								container.Node.IsChecked = true;
 							else
 								container.Node.IsChecked = !container.Node.IsChecked;
+						} else {
+							container.Node.ActivateItem(e);
 						}
 					}
 					break;