Update upstream source from tag 'upstream/2.3.3+dfsg'

Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h
index bbddfb9..68c7c68 100644
--- a/src/lib/platform/OSXScreen.h
+++ b/src/lib/platform/OSXScreen.h
@@ -97,9 +97,9 @@ public:
     virtual void        setSequenceNumber(UInt32);
     virtual bool        isPrimary() const;
     virtual void        fakeDraggingFiles(DragFileList fileList);
-    virtual String&    getDraggingFilename();
+    virtual std::string& getDraggingFilename();
     
-    const String&        getDropTarget() const { return m_dropTarget; }
+    const std::string& getDropTarget() const { return m_dropTarget; }
     void                waitForCarbonLoop() const;
     
 protected:
@@ -338,7 +338,7 @@ private:
     IEventQueue*            m_events;
     
     Thread*                m_getDropTargetThread;
-    String                    m_dropTarget;
+    std::string m_dropTarget;
     
 #if defined(MAC_OS_X_VERSION_10_7)
     Mutex*                    m_carbonLoopMutex;