From 4d7aaace23b10414b52376713824e5799f0ecc76 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Tue, 23 Jul 2013 14:38:48 +0100
Subject: [PATCH] Changed DragAndDropContainer::getCurrentDragDescription() to
 return a var.

---
 .../juce_gui_basics/mouse/juce_DragAndDropContainer.cpp   | 4 ++--
 modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp
index d2a8966e48..b13e249774 100644
--- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp
+++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.cpp
@@ -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)
diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
index c028d745d5..b376e7cc7c 100644
--- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
+++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
@@ -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; }