Browse Source

Exception box is now working again.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@23 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 21 years ago
parent
commit
4a080aa864
  1. 35
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs
  2. 2
      src/Main/StartUp/Project/Dialogs/ExceptionBox.cs

35
src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs

@ -72,7 +72,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
//ivoko: please do not touch or discuss with me: we use another CCDP //ivoko: please do not touch or discuss with me: we use another CCDP
return new CodeCompletionDataProvider(ctrlSpace, false); return new CodeCompletionDataProvider(ctrlSpace, false);
} }
protected override void InitializeTextAreaControl(TextAreaControl newControl) protected override void InitializeTextAreaControl(TextAreaControl newControl)
{ {
base.InitializeTextAreaControl(newControl); base.InitializeTextAreaControl(newControl);
@ -88,19 +88,32 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
newControl.MouseWheel += new MouseEventHandler(TextAreaMouseWheel); newControl.MouseWheel += new MouseEventHandler(TextAreaMouseWheel);
newControl.DoHandleMousewheel = false; newControl.DoHandleMousewheel = false;
} }
protected override void Dispose(bool disposing)
{
base.Dispose(Disposing);
if (disposing) {
CloseCodeCompletionWindow(this, EventArgs.Empty);
CloseInsightWindow(this, EventArgs.Empty);
}
}
void CloseCodeCompletionWindow(object sender, EventArgs e) void CloseCodeCompletionWindow(object sender, EventArgs e)
{ {
codeCompletionWindow.Closed -= new EventHandler(CloseCodeCompletionWindow); if (codeCompletionWindow != null) {
codeCompletionWindow.Dispose(); codeCompletionWindow.Closed -= new EventHandler(CloseCodeCompletionWindow);
codeCompletionWindow = null; codeCompletionWindow.Dispose();
codeCompletionWindow = null;
}
} }
void CloseInsightWindow(object sender, EventArgs e) void CloseInsightWindow(object sender, EventArgs e)
{ {
insightWindow.Closed -= new EventHandler(CloseInsightWindow); if (insightWindow != null) {
insightWindow.Dispose(); insightWindow.Closed -= new EventHandler(CloseInsightWindow);
insightWindow = null; insightWindow.Dispose();
insightWindow = null;
}
} }
void TextAreaMouseWheel(object sender, MouseEventArgs e) void TextAreaMouseWheel(object sender, MouseEventArgs e)
{ {
TextAreaControl textAreaControl = (TextAreaControl)sender; TextAreaControl textAreaControl = (TextAreaControl)sender;
@ -163,7 +176,6 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
void CaretPositionChanged(object sender, EventArgs e) void CaretPositionChanged(object sender, EventArgs e)
{ {
StatusBarService.SetCaretPosition(ActiveTextAreaControl.TextArea.TextView.GetVisualColumn(ActiveTextAreaControl.Caret.Line, ActiveTextAreaControl.Caret.Column), ActiveTextAreaControl.Caret.Line, ActiveTextAreaControl.Caret.Column); StatusBarService.SetCaretPosition(ActiveTextAreaControl.TextArea.TextView.GetVisualColumn(ActiveTextAreaControl.Caret.Line, ActiveTextAreaControl.Caret.Column), ActiveTextAreaControl.Caret.Line, ActiveTextAreaControl.Caret.Column);
} }
@ -456,11 +468,6 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
} }
} }
protected override void Dispose(bool dispose)
{
base.Dispose(dispose);
}
public override string GetRangeDescription(int selectedItem, int itemCount) public override string GetRangeDescription(int selectedItem, int itemCount)
{ {

2
src/Main/StartUp/Project/Dialogs/ExceptionBox.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop
exceptionTextBox.Text = e.ToString(); exceptionTextBox.Text = e.ToString();
ResourceManager resources = new ResourceManager("BitmapResources", Assembly.GetEntryAssembly()); ResourceManager resources = new ResourceManager("Resources.BitmapResources", Assembly.GetEntryAssembly());
this.pictureBox.Image = (Bitmap)resources.GetObject("ErrorReport"); this.pictureBox.Image = (Bitmap)resources.GetObject("ErrorReport");
} }

Loading…
Cancel
Save