From 07dd5f5a00ee9b3ecaf9bbdf6f1c28b913c1c13f Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Fri, 1 Dec 2006 20:56:52 +0000
Subject: [PATCH] Fixed SD2-1159 - InvalidOperation exception thrown when
 trying to delete or cut an inherited control in the forms designer. The forms
 designer's clipboard context menu items now have loadclasslazy set to false
 so they are correctly disabled for inherited controls. Changed the
 FormKeyHandler so that when the delete key is pressed a check is made to
 ensure that the deletion command is enabled.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2114 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../FormsDesigner/Project/FormsDesigner.addin               | 4 ++++
 .../FormsDesigner/Project/Src/FormKeyHandler.cs             | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
index 84afbcfbc0..478675573e 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
@@ -53,18 +53,22 @@
 		<MenuItem id = "Cut"
 		          label = "${res:XML.MainMenu.EditMenu.Cut}"
 		          icon = "Icons.16x16.CutIcon"
+		          loadclasslazy = "false"
 		          class = "ICSharpCode.SharpDevelop.Commands.Cut"/>
 		<MenuItem id = "Copy"
 		          label = "${res:XML.MainMenu.EditMenu.Copy}"
 		          icon = "Icons.16x16.CopyIcon"
+		          loadclasslazy = "false"
 		          class = "ICSharpCode.SharpDevelop.Commands.Copy"/>
 		<MenuItem id = "Paste"
 		          label = "${res:XML.MainMenu.EditMenu.Paste}"
 		          icon = "Icons.16x16.PasteIcon"
+		          loadclasslazy = "false"
 		          class = "ICSharpCode.SharpDevelop.Commands.Paste"/>
 		<MenuItem id = "Delete"
 		          label = "${res:XML.MainMenu.EditMenu.Delete}"
 		          icon = "Icons.16x16.DeleteIcon"
+		          loadclasslazy = "false"
 		          class = "ICSharpCode.SharpDevelop.Commands.Delete"/>
 		<MenuItem id = "PropertySeparator" type = "Separator"/>
 		<MenuItem id          = "ShowProperties"
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs
index 4a25659db6..ae31591a66 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs
@@ -96,6 +96,12 @@ namespace ICSharpCode.FormsDesigner
 			
 			CommandWrapper commandWrapper = (CommandWrapper)keyTable[keyPressed];
 			if (commandWrapper != null) {
+				if (commandWrapper.CommandID == MenuCommands.Delete) {
+					// Check Delete menu is enabled.
+					if (!formDesigner.EnableDelete) {
+						return false;
+					}
+				}
 				LoggingService.Debug("Run menu command: " + commandWrapper.CommandID);
 				Control ctl = WorkbenchSingleton.ActiveControl;