From f4c5f8f1263fc9987acbf05613a386175aa57700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Wed, 21 Jun 2006 08:07:46 +0000 Subject: [PATCH] Fixed SD2-855:Attempting to create event handler for xml form terminates SharpDevelop git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1502 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../DesignerGenerator/AbstractDesignerGenerator.cs | 1 - .../Src/DesignerGenerator/XmlDesignerGenerator.cs | 1 + .../FormsDesigner/Project/Src/DesignerViewContent.cs | 12 +++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs index 7f23c9c77b..edd18c8cef 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs @@ -38,7 +38,6 @@ namespace ICSharpCode.FormsDesigner FormsDesignerViewContent viewContent; bool failedDesignerInitialize = false; - CodeDomProvider provider; public CodeDomProvider CodeDomProvider { diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/XmlDesignerGenerator.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/XmlDesignerGenerator.cs index b403d00439..fb78460bb7 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/XmlDesignerGenerator.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/XmlDesignerGenerator.cs @@ -59,6 +59,7 @@ namespace ICSharpCode.FormsDesigner //xml.WriteEndDocument(); viewContent.Document.TextContent = writer.ToString(); } + public bool InsertComponentEvent(IComponent component, EventDescriptor edesc, string eventMethodName, string body, out string file, out int position) { position = 0; diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs index 5ba27408c3..0391f67f33 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs @@ -296,11 +296,13 @@ namespace ICSharpCode.FormsDesigner { int position; string file; - generator.InsertComponentEvent(component, edesc, eventMethodName, "", out file, out position); - if (FileUtility.IsEqualFileName(file, this.TextEditorControl.FileName)) { - ShowSourceCode(position); - } else { - FileService.JumpToFilePosition(file, position - 1, 0); + bool eventCreated = generator.InsertComponentEvent(component, edesc, eventMethodName, "", out file, out position); + if (eventCreated) { + if (FileUtility.IsEqualFileName(file, this.TextEditorControl.FileName)) { + ShowSourceCode(position); + } else { + FileService.JumpToFilePosition(file, position - 1, 0); + } } }