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

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"

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;