Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenFolderDialog #7244

Merged
merged 13 commits into from
Jul 7, 2023
Merged

OpenFolderDialog #7244

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b587388
OpenFolderDialog
miloush Nov 1, 2022
0c4e8d9
Multiselect and FileNames for folders
miloush Nov 2, 2022
bc3620d
SRID deprecation
miloush Apr 17, 2023
5998902
API review update - private protected ctros
miloush Apr 19, 2023
5f6e180
API review update - FolderNames
miloush Jun 11, 2023
6b8393d
FileOk event disunification
miloush Jun 12, 2023
7b9ed4c
comments update
miloush Jul 2, 2023
f7d8ffa
FileNames -> ItemNames
miloush Jul 2, 2023
0265f8d
removed duplicate SetFileName call
miloush Jul 2, 2023
b7349d5
move FORCEFILESYSTEM into Initialize
miloush Jul 2, 2023
38ea713
keep RestoreDirectory in FileDialog
miloush Jul 4, 2023
7f0484b
common dialogs ToString()
miloush Jul 6, 2023
00351e7
Updated ref assemblies and api compat baseline
dipeshmsft Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/PresentationFramework-ref-Net48.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Compat issues with assembly PresentationFramework:
CannotMakeMemberNonVirtual : Member 'public System.Boolean Microsoft.Win32.FileDialog.CheckFileExists' is non-virtual in the implementation but is virtual in the contract.
CannotMakeMemberNonVirtual : Member 'public System.Boolean Microsoft.Win32.FileDialog.CheckFileExists.get()' is non-virtual in the implementation but is virtual in the contract.
CannotMakeMemberNonVirtual : Member 'public void Microsoft.Win32.FileDialog.CheckFileExists.set(System.Boolean)' is non-virtual in the implementation but is virtual in the contract.
MembersMustExist : Member 'internal MS.Internal.AppModel.IFileDialog Microsoft.Win32.FileDialog.CreateVistaDialog()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'protected void Microsoft.Win32.FileDialog.OnFileOk(System.ComponentModel.CancelEventArgs)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'protected System.Int32 Microsoft.Win32.FileDialog.Options.get()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.String[] Microsoft.Win32.FileDialog.ProcessVistaFiles(MS.Internal.AppModel.IFileDialog)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Boolean Microsoft.Win32.FileDialog.RunFileDialog(MS.Win32.NativeMethods.OPENFILENAME_I)' does not exist in the implementation but it does exist in the contract.
CannotRemoveBaseTypeOrInterface : Type 'System.Windows.AttachedPropertyBrowsableForChildrenAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
Expand Down
5 changes: 2 additions & 3 deletions src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/PresentationFramework-ref.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Compat issues with assembly PresentationFramework:
MembersMustExist : Member 'internal MS.Internal.AppModel.IFileDialog Microsoft.Win32.FileDialog.CreateVistaDialog()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.String[] Microsoft.Win32.FileDialog.ProcessVistaFiles(MS.Internal.AppModel.IFileDialog)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'internal System.Boolean Microsoft.Win32.FileDialog.RunFileDialog(MS.Win32.NativeMethods.OPENFILENAME_I)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'private protected MS.Internal.AppModel.IFileDialog Microsoft.Win32.CommonItemDialog.CreateDialog()' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'private protected System.String[] Microsoft.Win32.FileDialog.ProcessFiles(MS.Internal.AppModel.IFileDialog)' does not exist in the implementation but it does exist in the contract.
CannotChangeAttribute : Attribute 'System.ComponentModel.DesignerSerializationVisibilityAttribute' on 'System.ComponentModel.DesignerProperties.GetIsInDesignMode(System.Windows.DependencyObject)' changed from '[DesignerSerializationVisibilityAttribute(0)]' in the contract to '[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]' in the implementation.
CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Windows.AttachedPropertyBrowsableForChildrenAttribute' changed from '[AttributeUsageAttribute(64, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Method, AllowMultiple=false)]' in the implementation.
CannotChangeAttribute : Attribute 'System.ComponentModel.DesignerSerializationVisibilityAttribute' on 'System.Windows.DataTemplate.Triggers' changed from '[DesignerSerializationVisibilityAttribute(2)]' in the contract to '[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Content)]' in the implementation.
Expand Down
14 changes: 6 additions & 8 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/Microsoft/Win32/CommonDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public object Tag
//---------------------------------------------------
#region Protected Methods


// This method is not used by IFileDialog API. Kept for compatibility as CommonDialog can be derived from.
/// <summary>
/// Defines the common dialog box hook procedure that is overridden to
/// add specific functionality to a common dialog box.
Expand Down Expand Up @@ -275,13 +275,12 @@ protected virtual void CheckPermissionsToShowDialog()
//---------------------------------------------------
#region Internal Methods

// This method is not used by IFileDialog API. Kept for compatibility (see HookProc).
/// <summary>
/// Centers the given window on the screen. This method is used by HookProc
/// to center the dialog on the screen before it is shown. We can't mark it
/// private because we need to call it from our derived classes like
/// FileDialog.
/// to center the dialog on the screen before it is shown.
/// </summary>
internal void MoveToScreenCenter(HandleRef hWnd)
private void MoveToScreenCenter(HandleRef hWnd)
{
// Create an IntPtr to store a handle to the monitor.
IntPtr hMonitor = IntPtr.Zero;
Expand Down Expand Up @@ -343,9 +342,8 @@ internal void MoveToScreenCenter(HandleRef hWnd)
// Internal Properties
//
//---------------------------------------------------
#region Internal Properties

#endregion Internal Properties
//#region Internal Properties
//#endregion Internal Properties

//---------------------------------------------------
//
Expand Down
Loading