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
parent
commit
655f199647
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/Windows/Avalonia.Win32/DataObject.cs
  2. 2
      src/Windows/Avalonia.Win32/OleDropTarget.cs

1
src/Windows/Avalonia.Win32/DataObject.cs

@ -103,6 +103,7 @@ namespace Avalonia.Win32
private IDataObject _wrapped; private IDataObject _wrapped;
public IDataObject Wrapped => _wrapped;
public DataObject(IDataObject wrapped) public DataObject(IDataObject wrapped)
{ {

2
src/Windows/Avalonia.Win32/OleDropTarget.cs

@ -217,7 +217,7 @@ namespace Avalonia.Win32
if (MicroComRuntime.TryUnwrapManagedObject(pDataObj) is DataObject dataObject) if (MicroComRuntime.TryUnwrapManagedObject(pDataObj) is DataObject dataObject)
{ {
return dataObject; return dataObject.Wrapped;
} }
return new OleDataObject(pDataObj); return new OleDataObject(pDataObj);
} }

Loading…
Cancel
Save