diff --git a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
index ffc8d8dfe5..fb8a62eaf9 100644
--- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
+++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
@@ -28,7 +28,7 @@
..\..\RequiredLibraries\FSharp.Build.Tasks.dll
- ..\..\..\..\..\Libraries\log4net\log4net.dll
+ ..\..\..\..\..\..\..\3.0\SharpDevelop\src\Libraries\log4net\log4net.dll
False
@@ -39,10 +39,19 @@
3.5
False
+
..\..\..\..\..\Libraries\Mono.Cecil\Mono.Cecil.dll
False
+
+
+ 3.0
+ False
+
+
+ 3.0
+
False
@@ -50,9 +59,17 @@
3.5
False
+
False
+
+ 3.0
+
+
+ 3.0
+
+
@@ -75,11 +92,6 @@
-
- {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}
- WinFormsUI
- False
-
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}
ICSharpCode.TextEditor
diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixExtensionToProject.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixExtensionToProject.cs
index dbb5bfc748..2f728de1b8 100644
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixExtensionToProject.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixExtensionToProject.cs
@@ -25,7 +25,7 @@ namespace ICSharpCode.WixBinding
// Display file dialog.
using (OpenFileDialog fileDialog = CreateOpenFileDialog()) {
- if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainForm)) {
+ if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainWin32Window)) {
// Add files to project.
WixProject project = ((WixProject)folderNode.Project);
project.AddWixExtensions(fileDialog.FileNames);
diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixItemToProjectBaseCommand.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixItemToProjectBaseCommand.cs
index 10a2271874..8d50a5c021 100644
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixItemToProjectBaseCommand.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixItemToProjectBaseCommand.cs
@@ -39,7 +39,7 @@ namespace ICSharpCode.WixBinding
// Display file dialog.
using (OpenFileDialog fileDialog = CreateOpenFileDialog(FileFilter)) {
- if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainForm)) {
+ if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainWin32Window)) {
// Add files to project.
WixProject project = ((WixProject)folderNode.Project);
AddFiles(project, fileDialog.FileNames);
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddNewClassCommand.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddNewClassCommand.cs
index 9299dd9f96..a718c52d78 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddNewClassCommand.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddNewClassCommand.cs
@@ -27,7 +27,7 @@ namespace ClassWizard
using (AddClassForm form = new AddClassForm())
{
form.Owner = (Form) WorkbenchSingleton.Workbench;
- form.ShowDialog(WorkbenchSingleton.MainForm);
+ form.ShowDialog(WorkbenchSingleton.MainWin32Window);
}
}
}
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/ClassesList.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/ClassesList.cs
index 40fcc7f319..47a16ba9aa 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/ClassesList.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/ClassesList.cs
@@ -7,14 +7,14 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
+using ICSharpCode.SharpDevelop.Gui;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
-
using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Project;
-using ICSharpCode.SharpDevelop.Gui.XmlForms;
using ICSharpCode.SharpDevelop.Dom;
+using ICSharpCode.SharpDevelop.Gui.XmlForms;
+using ICSharpCode.SharpDevelop.Project;
namespace ClassWizard
{
@@ -147,7 +147,7 @@ namespace ClassWizard
initialized = true;
}
- classesList.ShowDialog();
+ classesList.ShowDialog(WorkbenchSingleton.MainWin32Window);
return classesList.DialogResult == DialogResult.OK;
}
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs
index 1a93f32039..a1ab90ec07 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs
@@ -17,7 +17,7 @@ namespace ICSharpCode.FormsDesigner
public override void Run()
{
using (ConfigureSideBarDialog configureSideBarDialog = new ConfigureSideBarDialog()) {
- if (configureSideBarDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if (configureSideBarDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
ToolboxProvider.ReloadSideTabs(true);
}
}
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
index 57fa62526a..a03a250d8a 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
@@ -221,7 +221,7 @@ namespace ICSharpCode.FormsDesigner.Gui
fdiag.Multiselect = true;
fdiag.CheckFileExists = true;
- if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
ControlDictionary["fileNameTextBox"].Text = string.Join(";", fdiag.FileNames);
}
}
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs
index f4b5e89042..d84fbe9ca5 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs
@@ -52,7 +52,7 @@ namespace ICSharpCode.FormsDesigner.Services
#region Dialog functions
public IWin32Window GetDialogOwnerWindow()
{
- return WorkbenchSingleton.MainForm;
+ return WorkbenchSingleton.MainWin32Window;
}
public DialogResult ShowDialog(Form form)
diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs
index 8a31ef65e5..bfc2bc6017 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs
@@ -32,7 +32,7 @@ namespace ResourceEditor
fdiag.Multiselect = true;
fdiag.CheckFileExists = true;
- if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
foreach (string filename in fdiag.FileNames) {
string oresname = Path.ChangeExtension(Path.GetFileName(filename), null);
if (oresname == "") oresname = "new";
diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs
index de892119f6..4a4aab2a92 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs
@@ -52,7 +52,7 @@ namespace ResourceEditor
return;
}
- DialogResult dr = sdialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
+ DialogResult dr = sdialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
sdialog.Dispose();
if (dr != DialogResult.OK) {
return;
diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs
index c93f2ea515..deda2caf34 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs
@@ -42,7 +42,7 @@ namespace ResourceEditor
fileDialog.Filter = "All files (*.*)|*.*";
fileDialog.CheckFileExists = true;
- if(fileDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if(fileDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
try {
bitmap = new Bitmap(fileDialog.FileName);
} catch {
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs
index 3d0db5c9a1..fba80cdd21 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs
@@ -52,7 +52,7 @@ namespace ICSharpCode.XmlEditor
dialog.FilterIndex = 1;
}
- if (dialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if (dialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
return dialog.FileName;
}
}
diff --git a/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs b/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
index 84f1efe2ed..7d0f345916 100644
--- a/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
+++ b/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
@@ -32,10 +32,11 @@ namespace ICSharpCode.AddInManager
{
if (instance == null) {
instance = new ManagerForm();
- #if !STANDALONE
- instance.Owner = ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm;
- #endif
+ #if STANDALONE
instance.Show();
+ #else
+ instance.Show(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
+ #endif
} else {
instance.Activate();
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
index 72a206f73b..9f944b3e3b 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
@@ -19,7 +19,8 @@
4096
false
Always
- v2.0
+ v3.0
+ "C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis"
true
@@ -35,11 +36,20 @@
TRACE
+
+ 3.0
+
+
+ 3.0
+
+
+ 3.0
+
@@ -175,11 +185,6 @@
ICSharpCode.Core.WinForms
False
-
- {80318B5F-A25D-45AB-8A95-EF31D2370A4C}
- ICSharpCode.SharpDevelop.Sda
- False
-
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
index d7c43398f6..b272afd359 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
@@ -137,7 +137,7 @@ namespace ICSharpCode.SharpDevelop.Services
form.exceptionDetails.Refresh();
form.buttonContinue.Enabled = canContinue;
- form.ShowDialog(Gui.WorkbenchSingleton.MainForm);
+ form.ShowDialog(Gui.WorkbenchSingleton.MainWin32Window);
return form.result;
}
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs
index a69cc4dbbd..6ab99efa0d 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs
@@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Services
form.textBox.Text = message;
form.pictureBox.Image = icon;
form.buttonContinue.Enabled = canContinue;
- form.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
+ form.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
return form.result;
}
}
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
index 07ec4dd2c5..932e116f25 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
@@ -189,7 +189,7 @@ namespace ICSharpCode.SharpDevelop.Services
public void ShowAttachDialog()
{
using (AttachToProcessForm attachForm = new AttachToProcessForm()) {
- if (attachForm.ShowDialog() == DialogResult.OK) {
+ if (attachForm.ShowDialog(WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
Attach(attachForm.Process);
}
}
@@ -664,7 +664,7 @@ namespace ICSharpCode.SharpDevelop.Services
public void JumpToCurrentLine()
{
- WorkbenchSingleton.MainForm.Activate();
+ WorkbenchSingleton.MainWindow.Activate();
DebuggerService.RemoveCurrentLineMarker();
if (debuggedProcess != null) {
SourcecodeSegment nextStatement = debuggedProcess.NextStatement;
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ErrorNode.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ErrorNode.cs
index 86b9c3d645..926e5e1778 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ErrorNode.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ErrorNode.cs
@@ -10,7 +10,6 @@ using System.Collections.Generic;
using System.Windows.Forms;
using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Sda;
using Debugger;
using Debugger.Expressions;
@@ -48,9 +47,7 @@ namespace Debugger.AddIn.TreeModel
showError.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.ShowFullError}");
showError.Checked = false;
showError.Click += delegate {
- using (ExceptionBox box = new ExceptionBox(error, null, false)) {
- box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
- }
+ MessageService.ShowError(error, null);
};
menu.Items.AddRange(new ToolStripItem[] {
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorButton.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorButton.cs
index b3b317d216..cec616ad99 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorButton.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorButton.cs
@@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui
p = PointToScreen(p);
using (ColorPaletteDialog clDlg = new ColorPaletteDialog(p.X, p.Y)) {
- clDlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
+ clDlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
if (clDlg.DialogResult == DialogResult.OK) {
CenterColor = clDlg.Color;
}
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorDialog.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorDialog.cs
index 9d0a247ccf..294346cb06 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorDialog.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/ColorDialog.cs
@@ -133,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
using (ColorDialog colDialog = new ColorDialog()) {
colDialog.FullOpen = true;
- if (colDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if (colDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
selectedColor = colDialog.Color;
DialogResult = DialogResult.OK;
}
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs
index 69d681516f..6dfc2dfa03 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs
@@ -182,7 +182,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
HighlightItem item = (HighlightItem)userList.SelectedItem;
using (EditHighlightingDialog dlg = new EditHighlightingDialog(item.Node)) {
- DialogResult res = dlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
+ DialogResult res = dlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
if (res == DialogResult.OK) {
using (XmlTextWriter writer = new XmlTextWriter(item.FileName, Encoding.UTF8)) {
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListNode.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListNode.cs
index f007848dbe..a06099f2bc 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListNode.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListNode.cs
@@ -181,7 +181,7 @@ namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
{
using (InputBox box = new InputBox()) {
box.Label.Text = ResourceService.GetString("Dialog.HighlightingEditor.KeywordList.EnterName");
- if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.Cancel) return;
+ if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.Cancel) return;
if (box.TextBox.Text == "") return;
foreach (string item in listBox.Items) {
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListsNode.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListsNode.cs
index 888c0410a1..d48615b280 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListsNode.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/KeywordListsNode.cs
@@ -82,7 +82,7 @@ namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
{
using (InputBox box = new InputBox()) {
box.Label.Text = ResourceService.GetString("Dialog.HighlightingEditor.KeywordLists.EnterName");
- if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.Cancel) return;
+ if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.Cancel) return;
if (box.TextBox.Text == "") return;
foreach (ListViewItem item in listView.Items) {
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/MarkersNode.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/MarkersNode.cs
index 7a91232bd8..4404c56145 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/MarkersNode.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/MarkersNode.cs
@@ -86,7 +86,7 @@ namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
{
using (InputBox box = new InputBox()) {
box.Label.Text = ResourceService.GetString("Dialog.HighlightingEditor.Markers.EnterName");
- if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.Cancel) return;
+ if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.Cancel) return;
if (box.TextBox.Text == "") return;
foreach (ListViewItem item in listView.Items) {
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/PropertiesNode.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/PropertiesNode.cs
index fd7d28e109..47e9ec8d5c 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/PropertiesNode.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/PropertiesNode.cs
@@ -96,7 +96,7 @@ namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
{
using (InputBox box = new InputBox()) {
box.Label.Text = ResourceService.GetString("Dialog.HighlightingEditor.Properties.EnterName");
- if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.Cancel) return;
+ if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.Cancel) return;
foreach (ListViewItem item in listView.Items) {
if (item.Text == box.TextBox.Text)
@@ -121,7 +121,7 @@ namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
using (InputBox box = new InputBox()) {
box.Text = ResourceService.GetString("Dialog.HighlightingEditor.EnterText");
box.Label.Text = String.Format(ResourceService.GetString("Dialog.HighlightingEditor.Properties.EnterValue"), listView.SelectedItems[0].Text);
- if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.Cancel) return;
+ if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.Cancel) return;
listView.SelectedItems[0].SubItems[1].Text = box.TextBox.Text;
}
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/RuleSetsNode.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/RuleSetsNode.cs
index f48b18733c..2e87bab233 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/RuleSetsNode.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/RuleSetsNode.cs
@@ -84,7 +84,7 @@ namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
{
using (InputBox box = new InputBox()) {
box.Label.Text = ResourceService.GetString("Dialog.HighlightingEditor.RuleSets.EnterName");
- if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.Cancel) return;
+ if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.Cancel) return;
if (box.TextBox.Text == "") return;
foreach (ListViewItem item in listView.Items) {
diff --git a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/SpansNode.cs b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/SpansNode.cs
index ccbf27556a..fb8ee9e0c8 100644
--- a/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/SpansNode.cs
+++ b/src/AddIns/Misc/HighlightingEditor/Project/Src/Nodes/SpansNode.cs
@@ -80,7 +80,7 @@ namespace ICSharpCode.SharpDevelop.AddIns.HighlightingEditor.Nodes
{
using (InputBox box = new InputBox()) {
box.Label.Text = ResourceService.GetString("Dialog.HighlightingEditor.Spans.EnterName");
- if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.Cancel) return;
+ if (box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.Cancel) return;
if (box.TextBox.Text == "") return;
diff --git a/src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs b/src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs
index 79c033985e..cdf9b5d841 100644
--- a/src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs
+++ b/src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs
@@ -7,6 +7,7 @@
using System;
using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.PInvokeAddIn
{
@@ -23,7 +24,7 @@ namespace ICSharpCode.PInvokeAddIn
{
// Show PInvoke dialog.
using(InsertPInvokeSignaturesForm form = new InsertPInvokeSignaturesForm()) {
- form.ShowDialog();
+ form.ShowDialog(WorkbenchSingleton.MainWin32Window);
}
}
}
diff --git a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/TextEditorContextMenuCommand.cs b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/TextEditorContextMenuCommand.cs
index 6f17d11383..1eedb42996 100644
--- a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/TextEditorContextMenuCommand.cs
+++ b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/TextEditorContextMenuCommand.cs
@@ -137,7 +137,7 @@ namespace ReflectorAddIn
Application.DoEvents();
Cursor.Current = Cursors.WaitCursor;
- ReflectorController.TryGoTo(element, WorkbenchSingleton.MainForm);
+ ReflectorController.TryGoTo(element, WorkbenchSingleton.MainWin32Window);
} finally {
Cursor.Current = Cursors.Default;
diff --git a/src/AddIns/Misc/RegExpTk/Project/Src/Commands/MenuCommand.cs b/src/AddIns/Misc/RegExpTk/Project/Src/Commands/MenuCommand.cs
index 1773c0d109..892c8dcd1b 100644
--- a/src/AddIns/Misc/RegExpTk/Project/Src/Commands/MenuCommand.cs
+++ b/src/AddIns/Misc/RegExpTk/Project/Src/Commands/MenuCommand.cs
@@ -7,17 +7,17 @@
using System;
using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
namespace Plugins.RegExpTk {
public class RegExpTkCommand : AbstractMenuCommand
{
-
public override void Run()
{
- RegExpTkDialog dialog = new RegExpTkDialog();
- dialog.Owner = ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm;
- dialog.Show();
+ using (RegExpTkDialog dialog = new RegExpTkDialog()) {
+ dialog.Show(WorkbenchSingleton.MainWin32Window);
+ }
}
}
}
diff --git a/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs b/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs
index 15a65d5b9a..bb3cc1ea55 100644
--- a/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs
+++ b/src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs
@@ -131,7 +131,7 @@ namespace Plugins.RegExpTk {
void showGroupForm(Match match)
{
GroupForm groupform = new GroupForm(match);
- groupform.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
+ groupform.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
}
void GroupListView_MouseUp(object sender, MouseEventArgs e)
@@ -253,7 +253,7 @@ namespace Plugins.RegExpTk {
sfd.DefaultExt = "dll";
sfd.CheckPathExists = true;
- if (sfd.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if (sfd.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
((TextBox)ControlDictionary["AssemblyFileCompileFileTextBox"]).Text = sfd.FileName;
}
}
diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/NewResourceCodeCompletionData.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/NewResourceCodeCompletionData.cs
index fb54c1e626..adf93845b3 100644
--- a/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/NewResourceCodeCompletionData.cs
+++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/NewResourceCodeCompletionData.cs
@@ -48,7 +48,7 @@ namespace Hornung.ResourceToolkit.CodeCompletion
EditStringResourceDialog dialog = new EditStringResourceDialog(this.content, this.preEnteredName, null, true);
dialog.Text = this.Description;
- if (dialog.ShowDialog(WorkbenchSingleton.MainForm) != DialogResult.OK) {
+ if (dialog.ShowDialog(WorkbenchSingleton.MainWin32Window) != DialogResult.OK) {
return false;
}
diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs
index 10f9554fb4..e7949eb6db 100644
--- a/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs
+++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs
@@ -100,7 +100,7 @@ namespace Hornung.ResourceToolkit.Commands
if (svalue == null) {
dialog.Text = String.Format(CultureInfo.CurrentCulture, StringParser.Parse("${res:Hornung.ResourceToolkit.CodeCompletion.AddNewDescription}"), result.ResourceFileContent.FileName);
}
- if (dialog.ShowDialog(WorkbenchSingleton.MainForm) == DialogResult.OK) {
+ if (dialog.ShowDialog(WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
if (svalue == null) {
// Add new resource.
result.ResourceFileContent.Add(dialog.Key, dialog.Value);
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
index daf014d8e6..b8cb6d186c 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
@@ -365,7 +365,7 @@ namespace SearchAndReplace
if (monitor != null && monitor.IsCancelled)
return;
if (monitor != null) monitor.ShowingDialog = true;
- MessageBox.Show(WorkbenchSingleton.MainForm,
+ MessageBox.Show(WorkbenchSingleton.MainWin32Window,
ResourceService.GetString("Dialog.NewProject.SearchReplace.SearchStringNotFound"),
ResourceService.GetString("Dialog.NewProject.SearchReplace.SearchStringNotFound.Title"),
MessageBoxButtons.OK,
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
index 8c08a303a2..0e83d92e64 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
@@ -36,7 +36,7 @@ namespace SearchAndReplace
{
if (Instance == null) {
Instance = new SearchAndReplaceDialog(searchAndReplaceMode);
- Instance.Show(WorkbenchSingleton.MainForm);
+ Instance.Show(WorkbenchSingleton.MainWin32Window);
} else {
if (searchAndReplaceMode == SearchAndReplaceMode.Search) {
Instance.searchButton.PerformClick();
@@ -54,7 +54,6 @@ namespace SearchAndReplace
public SearchAndReplaceDialog(SearchAndReplaceMode searchAndReplaceMode)
{
- this.Owner = WorkbenchSingleton.MainForm;
this.FormBorderStyle = FormBorderStyle.FixedToolWindow;
this.ShowInTaskbar = false;
this.TopMost = false;
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
index 592ae8c10b..ec893f3dbc 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
@@ -11,6 +11,7 @@ using System.Text;
using System.Windows.Forms;
using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
using Microsoft.Win32;
namespace ICSharpCode.Svn
@@ -46,7 +47,7 @@ namespace ICSharpCode.Svn
string path = GetPathFromRegistry("ProcPath");
if (path == null) {
using (TortoiseSvnNotFoundForm form = new TortoiseSvnNotFoundForm()) {
- form.ShowDialog();
+ form.ShowDialog(WorkbenchSingleton.MainWin32Window);
}
} else {
try {
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClientWrapper.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClientWrapper.cs
index adc0b0d3f3..b2e5266402 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClientWrapper.cs
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClientWrapper.cs
@@ -206,7 +206,7 @@ namespace ICSharpCode.Svn
LoggingService.Debug("PasswordPrompt");
try {
using (LoginDialog loginDialog = new LoginDialog(realm.Value, username.Value, maySave)) {
- if (WorkbenchSingleton.SafeThreadFunction