From e6b3143a29564a6f3261f107992db57d47f45892 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 10 Jun 2009 06:37:48 +0000 Subject: [PATCH] fixing coordinates for dnd, see #10876 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/window.mm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 9a10b88743..8052d8b314 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -706,7 +706,8 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), return NSDragOperationNone; wxDragResult result = wxDragNone; - wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil]; + wxPoint pt = wxFromNSPoint( m_osxView, nspoint ); if ( sourceDragMask & NSDragOperationLink ) result = wxDragLink; @@ -771,7 +772,8 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), return NSDragOperationNone; wxDragResult result = wxDragNone; - wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil]; + wxPoint pt = wxFromNSPoint( m_osxView, nspoint ); if ( sourceDragMask & NSDragOperationLink ) result = wxDragLink; @@ -811,7 +813,8 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo wxWindow* wxpeer = GetWXPeer(); wxDropTarget* target = wxpeer->GetDropTarget(); wxDragResult result = wxDragNone; - wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil]; + wxPoint pt = wxFromNSPoint( m_osxView, nspoint ); if ( sourceDragMask & NSDragOperationLink ) result = wxDragLink; -- 2.45.2