mirror of https://github.com/dahall/Vanara.git
Changed IDropTarget methods to use MouseButtonState param value instead of uint. Fixed dependencies.
parent
ee55299902
commit
f8e8e6f545
|
@ -747,7 +747,7 @@ namespace Vanara.PInvoke
|
||||||
// https://docs.microsoft.com/en-us/windows/desktop/api/oleidl/nf-oleidl-idroptarget-dragenter HRESULT DragEnter( IDataObject
|
// https://docs.microsoft.com/en-us/windows/desktop/api/oleidl/nf-oleidl-idroptarget-dragenter HRESULT DragEnter( IDataObject
|
||||||
// *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect );
|
// *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect );
|
||||||
[PreserveSig]
|
[PreserveSig]
|
||||||
HRESULT DragEnter([In] IDataObject pDataObj, [In] uint grfKeyState, [In] Point pt, [In, Out] ref DROPEFFECT pdwEffect);
|
HRESULT DragEnter([In] IDataObject pDataObj, [In] MouseButtonState grfKeyState, [In] Point pt, [In, Out] ref DROPEFFECT pdwEffect);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Provides target feedback to the user and communicates the drop's effect to the DoDragDrop function so it can communicate the
|
/// Provides target feedback to the user and communicates the drop's effect to the DoDragDrop function so it can communicate the
|
||||||
|
@ -853,7 +853,7 @@ namespace Vanara.PInvoke
|
||||||
// https://docs.microsoft.com/en-us/windows/desktop/api/oleidl/nf-oleidl-idroptarget-dragover HRESULT DragOver( DWORD
|
// https://docs.microsoft.com/en-us/windows/desktop/api/oleidl/nf-oleidl-idroptarget-dragover HRESULT DragOver( DWORD
|
||||||
// grfKeyState, POINTL pt, DWORD *pdwEffect );
|
// grfKeyState, POINTL pt, DWORD *pdwEffect );
|
||||||
[PreserveSig]
|
[PreserveSig]
|
||||||
HRESULT DragOver([In] uint grfKeyState, [In] Point pt, [In, Out] ref DROPEFFECT pdwEffect);
|
HRESULT DragOver([In] MouseButtonState grfKeyState, [In] Point pt, [In, Out] ref DROPEFFECT pdwEffect);
|
||||||
|
|
||||||
/// <summary>Removes target feedback and releases the data object.</summary>
|
/// <summary>Removes target feedback and releases the data object.</summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
|
@ -956,7 +956,7 @@ namespace Vanara.PInvoke
|
||||||
// https://docs.microsoft.com/en-us/windows/desktop/api/oleidl/nf-oleidl-idroptarget-drop HRESULT Drop( IDataObject *pDataObj,
|
// https://docs.microsoft.com/en-us/windows/desktop/api/oleidl/nf-oleidl-idroptarget-drop HRESULT Drop( IDataObject *pDataObj,
|
||||||
// DWORD grfKeyState, POINTL pt, DWORD *pdwEffect );
|
// DWORD grfKeyState, POINTL pt, DWORD *pdwEffect );
|
||||||
[PreserveSig]
|
[PreserveSig]
|
||||||
HRESULT Drop([In] IDataObject pDataObj, [In] uint grfKeyState, [In] Point pt, [In, Out] ref DROPEFFECT pdwEffect);
|
HRESULT Drop([In] IDataObject pDataObj, [In] MouseButtonState grfKeyState, [In] Point pt, [In, Out] ref DROPEFFECT pdwEffect);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -128,7 +128,7 @@ namespace Vanara.Windows.Shell
|
||||||
public event DragEventHandler DragOver;
|
public event DragEventHandler DragOver;
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
HRESULT IDropTarget.DragEnter(IDataObject pDataObj, uint grfKeyState, Point pt, ref DROPEFFECT pdwEffect)
|
HRESULT IDropTarget.DragEnter(IDataObject pDataObj, MouseButtonState grfKeyState, Point pt, ref DROPEFFECT pdwEffect)
|
||||||
{
|
{
|
||||||
System.Diagnostics.Debug.WriteLine($"IDropTarget.DragEnter: effect={pdwEffect}");
|
System.Diagnostics.Debug.WriteLine($"IDropTarget.DragEnter: effect={pdwEffect}");
|
||||||
var drgevent = CreateDragEventArgs(pDataObj, grfKeyState, pt, pdwEffect);
|
var drgevent = CreateDragEventArgs(pDataObj, grfKeyState, pt, pdwEffect);
|
||||||
|
@ -147,7 +147,7 @@ namespace Vanara.Windows.Shell
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
HRESULT IDropTarget.DragOver(uint grfKeyState, Point pt, ref DROPEFFECT pdwEffect)
|
HRESULT IDropTarget.DragOver(MouseButtonState grfKeyState, Point pt, ref DROPEFFECT pdwEffect)
|
||||||
{
|
{
|
||||||
System.Diagnostics.Debug.WriteLine($"IDropTarget.DragOver: effect={pdwEffect}");
|
System.Diagnostics.Debug.WriteLine($"IDropTarget.DragOver: effect={pdwEffect}");
|
||||||
var drgevent = CreateDragEventArgs(null, grfKeyState, pt, pdwEffect);
|
var drgevent = CreateDragEventArgs(null, grfKeyState, pt, pdwEffect);
|
||||||
|
@ -157,7 +157,7 @@ namespace Vanara.Windows.Shell
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
HRESULT IDropTarget.Drop(IDataObject pDataObj, uint grfKeyState, Point pt, ref DROPEFFECT pdwEffect)
|
HRESULT IDropTarget.Drop(IDataObject pDataObj, MouseButtonState grfKeyState, Point pt, ref DROPEFFECT pdwEffect)
|
||||||
{
|
{
|
||||||
System.Diagnostics.Debug.WriteLine($"IDropTarget.Drop: effect={pdwEffect}");
|
System.Diagnostics.Debug.WriteLine($"IDropTarget.Drop: effect={pdwEffect}");
|
||||||
var drgevent = CreateDragEventArgs(pDataObj, grfKeyState, pt, pdwEffect);
|
var drgevent = CreateDragEventArgs(pDataObj, grfKeyState, pt, pdwEffect);
|
||||||
|
@ -167,7 +167,7 @@ namespace Vanara.Windows.Shell
|
||||||
return HRESULT.S_OK;
|
return HRESULT.S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
private DragEventArgs CreateDragEventArgs(IDataObject pDataObj, uint grfKeyState, Point pt, DROPEFFECT pdwEffect)
|
private DragEventArgs CreateDragEventArgs(IDataObject pDataObj, MouseButtonState grfKeyState, Point pt, DROPEFFECT pdwEffect)
|
||||||
{
|
{
|
||||||
var data = pDataObj == null ? lastDataObject : new DataObject(pDataObj);
|
var data = pDataObj == null ? lastDataObject : new DataObject(pDataObj);
|
||||||
var drgevent = new DragEventArgs(data, (int)grfKeyState, pt.X, pt.Y, (DragDropEffects)pdwEffect, (DragDropEffects)lastEffect);
|
var drgevent = new DragEventArgs(data, (int)grfKeyState, pt.X, pt.Y, (DragDropEffects)pdwEffect, (DragDropEffects)lastEffect);
|
||||||
|
|
Loading…
Reference in New Issue