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

Unwrap win32 data object #12478

Merged
merged 1 commit into from
Aug 8, 2023
Merged

Unwrap win32 data object #12478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/Windows/Avalonia.Win32/DataObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public Win32Com.IEnumFORMATETC Clone()


private IDataObject _wrapped;
public IDataObject Wrapped => _wrapped;

public DataObject(IDataObject wrapped)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Windows/Avalonia.Win32/OleDropTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public static IDataObject GetAvaloniaObjectFromCOM(Win32Com.IDataObject pDataObj

if (MicroComRuntime.TryUnwrapManagedObject(pDataObj) is DataObject dataObject)
{
return dataObject;
return dataObject.Wrapped;
}
return new OleDataObject(pDataObj);
}
Expand Down