Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't call OnData() if OnEnter() rejected the drag (#9634)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-28 01:40:42 +00:00
parent 5b7668004b
commit 4095fb14c4
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/ole/droptgt.cpp
View File

@@ -244,6 +244,7 @@ STDMETHODIMP wxIDropTarget::DragOver(DWORD grfKeyState,
result = wxDragNone; result = wxDragNone;
} }
if ( result != wxDragNone ) {
// we need client coordinates to pass to wxWin functions // we need client coordinates to pass to wxWin functions
if ( !ScreenToClient(m_hwnd, (POINT *)&pt) ) if ( !ScreenToClient(m_hwnd, (POINT *)&pt) )
{ {
@@ -253,6 +254,10 @@ STDMETHODIMP wxIDropTarget::DragOver(DWORD grfKeyState,
*pdwEffect = ConvertDragResultToEffect( *pdwEffect = ConvertDragResultToEffect(
m_pTarget->OnDragOver(pt.x, pt.y, result) m_pTarget->OnDragOver(pt.x, pt.y, result)
); );
}
else {
*pdwEffect = DROPEFFECT_NONE;
}
return S_OK; return S_OK;
} }