Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Ungureanu <teromario@yahoo.com>2017-06-25 14:30:35 +0300
committerGitHub <noreply@github.com>2017-06-25 14:30:35 +0300
commit9e327cc667fec776b44231ab5bb2fa1a8e5ac34b (patch)
treefc80bbbdacf8604850b79b34b861235d8aa51761 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui
parentd6e5ec6dc6bea3595919bb15b90a6948e5bf5d5f (diff)
[Gtk#] Update to match newest API (#2682)
The Invoke API now can take both an Action and an EventHandler. delegate {} causes ambiguous results.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui')
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs6
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs4
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs2
3 files changed, 6 insertions, 6 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs
index 82035b410f..cfac69112e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs
@@ -42,7 +42,7 @@ namespace MonoDevelop.Ide.Gui
{
this.title = title;
if (!iconName.IsNull) {
- Application.Invoke (delegate {
+ Application.Invoke ((o, args) => {
var img = ImageService.GetIcon (iconName, IconSize.Menu);
icon = IdeApp.Workbench.StatusBar.ShowStatusIcon (img);
icon.Title = GettextCatalog.GetString ("Background Progress");
@@ -63,7 +63,7 @@ namespace MonoDevelop.Ide.Gui
else
tip = string.Format ("{0} ({1}%)\n{2}", title, (int)(Progress * 100), CurrentTaskName);
- Application.Invoke (delegate {
+ Application.Invoke ((o, args) => {
if (icon != null)
icon.ToolTip = tip;
});
@@ -72,7 +72,7 @@ namespace MonoDevelop.Ide.Gui
public override void Dispose()
{
base.Dispose ();
- Application.Invoke (delegate {
+ Application.Invoke ((o, args) => {
if (icon != null) {
icon.Dispose ();
icon = null;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
index 45432db1d3..d7f2fe48dd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
@@ -1029,7 +1029,7 @@ namespace MonoDevelop.Ide.Gui
TypeSystemService.ParseProjection (options, mimeType, token).ContinueWith (task => {
if (token.IsCancellationRequested)
return;
- Application.Invoke (delegate {
+ Application.Invoke ((o, args) => {
// this may be called after the document has closed, in that case the OnDocumentParsed event shouldn't be invoked.
var taskResult = task.Result;
if (isClosed || taskResult == null || token.IsCancellationRequested)
@@ -1046,7 +1046,7 @@ namespace MonoDevelop.Ide.Gui
TypeSystemService.ParseFile (options, mimeType, token).ContinueWith (task => {
if (token.IsCancellationRequested)
return;
- Application.Invoke (delegate {
+ Application.Invoke ((o, args) => {
// this may be called after the document has closed, in that case the OnDocumentParsed event shouldn't be invoked.
if (isClosed || task.Result == null || token.IsCancellationRequested)
return;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
index 28b078d663..08f596c6aa 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
@@ -283,7 +283,7 @@ namespace MonoDevelop.Ide.Gui
tabControl.CurrentTabIndex = tab.Index;
// Focus the tab in the next iteration since presenting the window may take some time
- Application.Invoke (delegate {
+ Application.Invoke ((o, args) => {
DockNotebook.ActiveNotebook = tabControl;
DeepGrabFocus (this.ActiveViewContent.Control);
});