Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 8e16f53

Browse files
fix samples/PInvokeAddIn
1 parent a3b76f0 commit 8e16f53

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System;
55
using ICSharpCode.Core;
6+
using ICSharpCode.SharpDevelop;
67
using ICSharpCode.SharpDevelop.Gui;
78

89
namespace ICSharpCode.PInvokeAddIn
@@ -20,7 +21,7 @@ public override void Run()
2021
{
2122
// Show PInvoke dialog.
2223
using(InsertPInvokeSignaturesForm form = new InsertPInvokeSignaturesForm()) {
23-
form.ShowDialog(WorkbenchSingleton.MainWin32Window);
24+
form.ShowDialog(SD.WinForms.MainWin32Window);
2425
}
2526
}
2627
}

samples/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesForm.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Windows.Forms;
99

1010
using ICSharpCode.Core;
11+
using ICSharpCode.SharpDevelop;
1112
using ICSharpCode.PInvokeAddIn.WebServices;
1213
using ICSharpCode.SharpDevelop.Editor;
1314
using ICSharpCode.SharpDevelop.Gui;
@@ -140,7 +141,7 @@ void InsertButtonClick(object sender, EventArgs e)
140141
string signature = GetSelectedPInvokeSignature(language);
141142

142143
if (signature.Length > 0) {
143-
ITextEditor textEditor = GetTextEditor();
144+
ITextEditor textEditor = SD.GetActiveViewContentService<ITextEditor>();
144145
if (textEditor != null) {
145146
generator.Generate(textEditor, signature);
146147
}
@@ -242,7 +243,7 @@ string GetSignature(SignatureInfo info)
242243

243244
string GetSourceFileLanguage()
244245
{
245-
ITextEditor textEditor = GetTextEditor();
246+
ITextEditor textEditor = SD.GetActiveViewContentService<ITextEditor>();
246247
if (textEditor != null) {
247248
string fileExtension = Path.GetExtension(textEditor.FileName);
248249
if (fileExtension.Equals(".vb", StringComparison.OrdinalIgnoreCase)) {
@@ -280,14 +281,5 @@ void LanguageComboBoxSelectedIndexChanged(object sender, EventArgs e)
280281
}
281282
}
282283
}
283-
284-
static ITextEditor GetTextEditor()
285-
{
286-
ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
287-
if (provider != null)
288-
return provider.TextEditor;
289-
else
290-
return null;
291-
}
292284
}
293285
}

0 commit comments

Comments
 (0)