diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp index e7c88ee0f3..0beb215fb5 100644 --- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp +++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp @@ -70,7 +70,7 @@ public: current->itemDragExit (sourceDetails); } - owner.dragOperationEnded(); + owner.dragOperationEnded (sourceDetails); } void paint (Graphics& g) override @@ -469,7 +469,7 @@ void DragAndDropContainer::startDragging (const var& sourceDescription, peer->performAnyPendingRepaintsNow(); #endif - dragOperationStarted(); + dragOperationStarted (dragImageComponent->sourceDetails); } } @@ -500,8 +500,8 @@ bool DragAndDropContainer::shouldDropFilesWhenDraggedExternally (const DragAndDr return false; } -void DragAndDropContainer::dragOperationStarted() {} -void DragAndDropContainer::dragOperationEnded() {} +void DragAndDropContainer::dragOperationStarted (const DragAndDropTarget::SourceDetails&) {} +void DragAndDropContainer::dragOperationEnded (const DragAndDropTarget::SourceDetails&) {} //============================================================================== DragAndDropTarget::SourceDetails::SourceDetails (const var& desc, Component* comp, Point pos) noexcept diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h index faf9b6b76b..f0e5c836f3 100644 --- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h +++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h @@ -169,10 +169,10 @@ protected: StringArray& files, bool& canMoveFiles); /** Subclasses can override this to be told when a drag starts. */ - virtual void dragOperationStarted(); + virtual void dragOperationStarted (const DragAndDropTarget::SourceDetails& sourceDetails); /** Subclasses can override this to be told when a drag finishes. */ - virtual void dragOperationEnded(); + virtual void dragOperationEnded (const DragAndDropTarget::SourceDetails& sourceDetails); private: //============================================================================== @@ -181,6 +181,8 @@ private: friend struct ContainerDeletePolicy; ScopedPointer dragImageComponent; + JUCE_DEPRECATED_WITH_BODY (virtual void dragOperationStarted (), {}); + JUCE_DEPRECATED_WITH_BODY (virtual void dragOperationEnded (), {}); JUCE_DEPRECATED_WITH_BODY (virtual bool shouldDropFilesWhenDraggedExternally (const String&, Component*, StringArray&, bool&), { return false; }) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DragAndDropContainer)