Revision: 28553
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28553
Author: damien78
Date: 2010-05-03 19:02:49 +0200 (Mon, 03 May 2010)
Log Message:
-----------
Drag & drop from OS: set to accept any drop operation by default for now
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp 2010-05-03
16:35:37 UTC (rev 28552)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp 2010-05-03
17:02:49 UTC (rev 28553)
@@ -111,7 +111,7 @@
HRESULT __stdcall GHOST_DropTargetWin32::DragEnter(IDataObject * pDataObject,
DWORD grfKeyState, POINTL pt, DWORD * pdwEffect)
{
// we don't know yet if we accept the drop.
- m_window->setAcceptDragOperation(false);
+ m_window->setAcceptDragOperation(true);
*pdwEffect = DROPEFFECT_NONE;
m_draggedObjectType = getGhostType(pDataObject);
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-05-03
16:35:37 UTC (rev 28552)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-05-03
17:02:49 UTC (rev 28553)
@@ -167,7 +167,7 @@
else if ([[draggingPBoard types] containsObject:NSStringPboardType])
m_draggedObjectType = GHOST_kDragnDropTypeString;
else return NSDragOperationNone;
- associatedWindow->setAcceptDragOperation(FALSE); //Drag operation needs
to be accepted explicitly by the event manager
+ associatedWindow->setAcceptDragOperation(TRUE); //Drag operation needs
to be accepted explicitly by the event manager
systemCocoa->handleDraggingEvent(GHOST_kEventDraggingEntered,
m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, nil);
return NSDragOperationCopy;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
