X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/668e3f703e9e7e44d55b393cfc588ec39037042c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/src/osx/cocoa/dnd.mm?ds=sidebyside diff --git a/src/osx/cocoa/dnd.mm b/src/osx/cocoa/dnd.mm index ecfa2e2b91..c12e16f5b9 100644 --- a/src/osx/cocoa/dnd.mm +++ b/src/osx/cocoa/dnd.mm @@ -11,6 +11,10 @@ #include "wx/wxprec.h" +#ifndef WX_PRECOMP +#include "wx/object.h" +#endif + #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -32,6 +36,8 @@ wxDragResult NSDragOperationToWxDragResult(NSDragOperation code) { switch (code) { + case NSDragOperationGeneric: + return wxDragCopy; case NSDragOperationCopy: return wxDragCopy; case NSDragOperationMove: @@ -214,7 +220,7 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags)) wxASSERT_MSG(theEvent, "DoDragDrop must be called in response to a mouse down or drag event."); NSPoint down = [theEvent locationInWindow]; - NSPoint p = [view convertPoint:down toView:nil]; + NSPoint p = [view convertPoint:down fromView:nil]; gCurrentSource = this; @@ -246,6 +252,23 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags)) result = NSDragOperationToWxDragResult([delegate code]); [delegate release]; [image release]; + + wxWindow* mouseUpTarget = wxWindow::GetCapture(); + + if ( mouseUpTarget == NULL ) + { + mouseUpTarget = m_window; + } + + if ( mouseUpTarget != NULL ) + { + wxMouseEvent wxevent(wxEVT_LEFT_DOWN); + ((wxWidgetCocoaImpl*)mouseUpTarget->GetPeer())->SetupMouseEvent(wxevent , theEvent) ; + wxevent.SetEventType(wxEVT_LEFT_UP); + + mouseUpTarget->HandleWindowEvent(wxevent); + } + gCurrentSource = NULL; }