mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Changed DragAndDropContainer::getCurrentDragDescription() to return a var.

Browse source
This commit is contained in:
jules 2013-07-23 14:38:48 +01:00
parent 7fbb6803dc
commit 4d7aaace23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp
View file

@ -417,10 +417,10 @@ bool DragAndDropContainer::isDragAndDropActive() const
return dragImageComponent != nullptr;
}
String DragAndDropContainer::getCurrentDragDescription() const
var DragAndDropContainer::getCurrentDragDescription() const
{
return dragImageComponent != nullptr ? currentDragDesc
: String::empty;
: var();
}
DragAndDropContainer* DragAndDropContainer::findParentDragContainerFor (Component* c)

8
modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
View file

@ -97,12 +97,12 @@ public:
/** Returns the description of the thing that's currently being dragged.
If nothing's being dragged, this will return an empty string, otherwise it's the
string that was passed into startDragging().
If nothing's being dragged, this will return a null var, otherwise it'll return
the var that was passed into startDragging().
@see startDragging
*/
String getCurrentDragDescription() const;
var getCurrentDragDescription() const;
/** Utility to find the DragAndDropContainer for a given Component.
@ -172,7 +172,7 @@ private:
class DragImageComponent;
friend class DragImageComponent;
ScopedPointer <Component> dragImageComponent;
String currentDragDesc;
var currentDragDesc;
JUCE_DEPRECATED (virtual bool shouldDropFilesWhenDraggedExternally (const String&, Component*, StringArray&, bool&)) { return false; }