Browse Source

Dispose option panels.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/dotnet4@4295 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
2b3d5c8fb8
  1. 2
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs
  2. 9
      src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
  3. 9
      src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptionsDialog.xaml.cs
  4. 8
      src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs

2
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.cs

@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
// re-evaluate if the project has the minimum version whenever this options page gets visible
// because the "convert project" button on the compiling tab page might have updated the MSBuild version.
applicationManifestComboBox.VisibleChanged += delegate {
applicationManifestComboBox.Enabled = project.MinimumSolutionVersion >= 10;
applicationManifestComboBox.Enabled = project.MinimumSolutionVersion >= Solution.SolutionVersionVS2008;
};
Get<TextBox>("projectFolder").Text = project.Directory;

9
src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.IO;
using ICSharpCode.Core;
@ -67,5 +68,13 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -67,5 +68,13 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
}
project.Save();
}
public override void Dispose()
{
foreach (IDisposable op in tabControl.OptionPanels.OfType<IDisposable>()) {
op.Dispose();
}
base.Dispose();
}
}
}

9
src/Main/Base/Project/Src/Gui/Dialogs/TabbedOptionsDialog.xaml.cs

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
@ -42,5 +43,13 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -42,5 +43,13 @@ namespace ICSharpCode.SharpDevelop.Gui
this.DialogResult = false;
Close();
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
foreach (IDisposable op in tabbedOptions.OptionPanels.OfType<IDisposable>()) {
op.Dispose();
}
}
}
}

8
src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml.cs

@ -50,6 +50,14 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -50,6 +50,14 @@ namespace ICSharpCode.SharpDevelop.Gui
Close();
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
foreach (IDisposable op in optionPanels.OfType<IDisposable>()) {
op.Dispose();
}
}
List<IOptionPanel> optionPanels = new List<IOptionPanel>();
OptionPanelNode activeNode;

Loading…
Cancel
Save