diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-17 01:13:10 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-17 01:13:10 +0300 |
| commit | 4c9ebf6bdd2d5113a3dab2a457a781ab68aae80a (patch) | |
| tree | 76af8de89b1376e8ecb60158aa1c8f3535aaeada /main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors | |
| parent | a3660b4ee48c7df4ef33a6131db23e68303dfb62 (diff) | |
| parent | 1877f337ee00e0487ca2522ed22893fc87b18b6b (diff) | |
Merge remote-tracking branch 'origin/master' into roslyn
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
main/src/addins/NUnit/Services/NUnitService.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors')
3 files changed, 17 insertions, 17 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs index 850e6a14f1..35a1754f2e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs @@ -269,20 +269,20 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors #endregion
//if 'OK' put items back in collection
- if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, toplevel) == (int)ResponseType.Ok)
- { - DesignerTransaction tran = CreateTransaction (Instance); - object old = collection; + using (dialog) {
+ if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, toplevel) == (int)ResponseType.Ok) { + DesignerTransaction tran = CreateTransaction (Instance); + object old = collection; - try { - collection.Clear();
- foreach (object[] o in itemStore)
- collection.Add (o[0]); - EndTransaction (Instance, tran, old, collection, true); - } - catch { - EndTransaction (Instance, tran, old, collection, false); - throw; + try { + collection.Clear ();
+ foreach (object[] o in itemStore)
+ collection.Add (o [0]); + EndTransaction (Instance, tran, old, collection, true); + } catch { + EndTransaction (Instance, tran, old, collection, false); + throw; + }
}
}
} diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs index 3488ab0044..925bf269e9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs @@ -85,12 +85,12 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors dialog.DefaultWidth = 500; dialog.DefaultHeight = 400; dialog.ShowAll (); - return MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, parent); + return MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, parent); } public void Dispose () { - dialog.Destroy (); + dialog.Dispose (); } void OnToggled (object s, Gtk.ToggledArgs args) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs index c171fc64a8..b7cb6a3f82 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs @@ -67,12 +67,12 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors dialog.DefaultWidth = 500; dialog.DefaultHeight = 400; dialog.ShowAll (); - return MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, dialog.TransientFor); + return MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog, dialog.TransientFor); } public void Dispose () { - dialog.Destroy (); + dialog.Dispose (); } } } |