Browse Source

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
shortcuts
Mike Krüger 19 years ago
parent
commit
f4c5f8f126
  1. 1
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs
  2. 1
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/XmlDesignerGenerator.cs
  3. 12
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

1
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs

@ -38,7 +38,6 @@ namespace ICSharpCode.FormsDesigner @@ -38,7 +38,6 @@ namespace ICSharpCode.FormsDesigner
FormsDesignerViewContent viewContent;
bool failedDesignerInitialize = false;
CodeDomProvider provider;
public CodeDomProvider CodeDomProvider {

1
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/XmlDesignerGenerator.cs

@ -59,6 +59,7 @@ namespace ICSharpCode.FormsDesigner @@ -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;

12
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

@ -296,11 +296,13 @@ namespace ICSharpCode.FormsDesigner @@ -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);
}
}
}

Loading…
Cancel
Save