From 525ae3fe38ea271551cba16b5069ae30fcb07387 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 22 Aug 2005 14:53:35 +0000 Subject: [PATCH] respecting DoDragDrop flags like CopyOnly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/dnd.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp index eac973dd14..d02ba3a18b 100644 --- a/src/mac/carbon/dnd.cpp +++ b/src/mac/carbon/dnd.cpp @@ -301,7 +301,7 @@ wxDropSource::~wxDropSource() } -wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags)) +wxDragResult wxDropSource::DoDragDrop(int flags) { wxASSERT_MSG( m_data, wxT("Drop source: no data") ); @@ -416,7 +416,12 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags)) gTrackingGlobals.m_currentSource = NULL ; bool optionDown = GetCurrentKeyModifiers() & optionKey ; - wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove; + wxDragResult dndresult = wxDragCopy ; + if ( flags != wxDrag_CopyOnly ) + { + // on mac the option key is always the indication for copy + dndresult = optionDown ? wxDragCopy : wxDragMove; + } return dndresult; } -- 2.45.2