]> git.saurik.com Git - wxWidgets.git/commitdiff
allow vetoing on drop, see #10876
authorStefan Csomor <csomor@advancedconcepts.ch>
Wed, 10 Jun 2009 06:46:05 +0000 (06:46 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Wed, 10 Jun 2009 06:46:05 +0000 (06:46 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/cocoa/window.mm

index 8052d8b314a71bd46c9f71cae5036ca554d146fa..713fce435b7c9f6ed1d1fc7f1d5455cbfb9919f9 100644 (file)
@@ -826,7 +826,10 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo
     PasteboardRef pboardRef;    
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
-    result = target->OnData(pt.x, pt.y, result);
+
+    if (target->OnDrop(pt.x, pt.y))
+        result = target->OnData(pt.x, pt.y, result);
+
     CFRelease(pboardRef);
      
     return result != wxDragNone;