Merge branch 'master' into newExceptionDialog

4 files changed, 7 insertions, 6 deletions

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs
index 8f3ad07d78..71cbbdc966 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/CommonFileDialogExtensions.cs
@@ -26,8 +26,8 @@
 using System;

 using System.IO;

 using System.Linq;

-using Gtk;

 using Microsoft.WindowsAPICodePack.Dialogs;

+using MonoDevelop.Components;

 using MonoDevelop.Components.Extensions;

 using MonoDevelop.Core;

 

@@ -50,11 +50,11 @@ namespace MonoDevelop.Platform
 				dialog.Title = data.Title;

 

 			dialog.InitialDirectory = data.CurrentFolder;

+			dialog.ShowHiddenItems = data.ShowHidden;

 

 			var fileDialog = dialog as CommonOpenFileDialog;

 			if (fileDialog != null) {

 				fileDialog.Multiselect = data.SelectMultiple;

-				fileDialog.ShowHiddenItems = data.ShowHidden;

 				if (data.Action == FileChooserAction.SelectFolder) {

 					fileDialog.IsFolderPicker = true;

 					return;

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
index 51e84a743f..de8c74197f 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
@@ -34,14 +34,15 @@ using System.Runtime.InteropServices;
 using System.Text;

 using Microsoft.WindowsAPICodePack.Dialogs;

 using Microsoft.WindowsAPICodePack.Dialogs.Controls;

+using MonoDevelop.Components;

 using MonoDevelop.Core;

+using MonoDevelop.Components.Extensions;

 using MonoDevelop.Ide;

 using MonoDevelop.Ide.Extensions;

 using MonoDevelop.Ide.Gui;

 using MonoDevelop.Projects.Text;

 using Microsoft.WindowsAPICodePack.Shell;

 using System.Windows;

-using Gtk;

 

 namespace MonoDevelop.Platform

 {

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs
index ec5123aded..ee641eb696 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/SelectFileDialogHandler.cs
@@ -29,8 +29,8 @@
 using System;

 using System.IO;

 using System.Linq;

-using Gtk;

 using Microsoft.WindowsAPICodePack.Dialogs;

+using MonoDevelop.Components;

 using MonoDevelop.Components.Extensions;

 using MonoDevelop.Core;

 using MonoDevelop.Ide;

@@ -44,7 +44,7 @@ namespace MonoDevelop.Platform
 			var parent = data.TransientFor ?? MessageService.RootWindow;

 

 			CommonFileDialog dialog;

-			if (data.Action == FileChooserAction.Open || data.Action == FileChooserAction.SelectFolder)

+			if ((data.Action & (FileChooserAction.Open | FileChooserAction.SelectFolder)) != 0)

 				dialog = new CustomCommonOpenFileDialog ();

 			else

 				dialog = new CommonSaveFileDialog ();

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
index 2a4612a1f0..0f19949e44 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj
@@ -32,7 +32,7 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1591;1573</NoWarn>
-    <DocumentationFile>..\..\..\build\AddIns\WindowsPlatform.xml</DocumentationFile>
+    <DocumentationFile>..\..\..\..\build\AddIns\WindowsPlatform\WindowsPlatform.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />