Browse Source
Merge pull request #12478 from AvaloniaUI/fixes/dnd-unwrap-win32-data-object
Unwrap win32 data object
release/11.0.3
Dan Walmsley
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
1 deletions
-
src/Windows/Avalonia.Win32/DataObject.cs
-
src/Windows/Avalonia.Win32/OleDropTarget.cs
|
|
|
@ -103,6 +103,7 @@ namespace Avalonia.Win32 |
|
|
|
|
|
|
|
|
|
|
|
private IDataObject _wrapped; |
|
|
|
public IDataObject Wrapped => _wrapped; |
|
|
|
|
|
|
|
public DataObject(IDataObject wrapped) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -217,7 +217,7 @@ namespace Avalonia.Win32 |
|
|
|
|
|
|
|
if (MicroComRuntime.TryUnwrapManagedObject(pDataObj) is DataObject dataObject) |
|
|
|
{ |
|
|
|
return dataObject; |
|
|
|
return dataObject.Wrapped; |
|
|
|
} |
|
|
|
return new OleDataObject(pDataObj); |
|
|
|
} |
|
|
|
|