diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2015-11-18 19:23:16 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2015-11-18 19:23:16 +0300 |
| commit | 152d962f35bfc6936271986df255ba8ba9946f68 (patch) | |
| tree | 6e5edbee00ec3c85bdf2d4539925a0bf8b15fb2e /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs | |
| parent | af51bbb30194855aa36c3df9986f128c41264610 (diff) | |
| parent | 2024e458f430c67a0aaaf9250911871a7a636f89 (diff) | |
Merge branch 'master' into roslyn
Conflicts:
main/build/MacOSX/monostub-test.m
main/build/MacOSX/monostub-utils.h
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FileEntry.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs index 42129615ae..f0d3d766e4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs @@ -34,11 +34,11 @@ using MonoDevelop.Ide.Gui; using MonoDevelop.Projects; using MonoDevelop.Ide.Gui.Content; using System.IO; -using Gtk; using MonoDevelop.Ide.Projects; using MonoDevelop.Ide.Desktop; using System.Linq; using MonoDevelop.Components; +using MonoDevelop.Components.Extensions; namespace MonoDevelop.Ide.Commands { @@ -80,7 +80,7 @@ namespace MonoDevelop.Ide.Commands { protected override void Run () { - var dlg = new OpenFileDialog (GettextCatalog.GetString ("File to Open"), Gtk.FileChooserAction.Open) { + var dlg = new OpenFileDialog (GettextCatalog.GetString ("File to Open"), SelectFileDialogAction.Open) { TransientFor = IdeApp.Workbench.RootWindow, ShowEncodingSelector = true, ShowViewerSelector = true, |