Switched to DECLARE_NO_COPY_CLASS

[wxWidgets.git] / include / wx / dnd.h

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 5ba516ade525f6705fb28621e3aeed174cbade9b..61f7625876e2d4ef4a025c0f57edab6cb53083fa 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -12,11 +12,16 @@
 #ifndef _WX_DND_H_BASE_
 #define _WX_DND_H_BASE_
 
 #ifndef _WX_DND_H_BASE_
 #define _WX_DND_H_BASE_
 

+#ifdef __GNUG__
+    #pragma interface "dndbase.h"
+#endif
+

 #include "wx/defs.h"
 
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/dataobj.h"
 #include "wx/defs.h"
 
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/dataobj.h"

+#include "wx/cursor.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -29,12 +34,13 @@ enum wxDragResult
     wxDragNone,     // drag target didn't accept the data
     wxDragCopy,     // the data was successfully copied
     wxDragMove,     // the data was successfully moved (MSW only)
     wxDragNone,     // drag target didn't accept the data
     wxDragCopy,     // the data was successfully copied
     wxDragMove,     // the data was successfully moved (MSW only)

+    wxDragLink,     // operation is a drag-link

     wxDragCancel    // the operation was cancelled by user (not an error)
 };
 
 inline WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res)
 {
     wxDragCancel    // the operation was cancelled by user (not an error)
 };
 
 inline WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res)
 {

-    return res == wxDragCopy || res == wxDragMove;
+    return res == wxDragCopy || res == wxDragMove || res == wxDragLink;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -45,7 +51,13 @@ inline WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res)
 class WXDLLEXPORT wxDropSourceBase
 {
 public:
 class WXDLLEXPORT wxDropSourceBase
 {
 public:

-    wxDropSourceBase() { m_data = (wxDataObject *)NULL; }
+    wxDropSourceBase(const wxCursor &cursorCopy = wxNullCursor,
+                     const wxCursor &cursorMove = wxNullCursor,
+                     const wxCursor &cursorStop = wxNullCursor)
+        : m_cursorCopy(cursorCopy),
+          m_cursorMove(cursorMove),
+          m_cursorStop(cursorStop)
+        { m_data = (wxDataObject *)NULL; }

     virtual ~wxDropSourceBase() { }
 
     // set the data which is transfered by drag and drop
     virtual ~wxDropSourceBase() { }
 
     // set the data which is transfered by drag and drop


@@ -55,21 +67,42 @@ public:
     wxDataObject *GetDataObject()
       { return m_data; }
 
     wxDataObject *GetDataObject()
       { return m_data; }
 

+    // set the icon corresponding to given drag result
+    void SetCursor(wxDragResult res, const wxCursor& cursor)
+    {
+        if ( res == wxDragCopy )
+            m_cursorCopy = cursor;
+        else if ( res == wxDragMove )
+            m_cursorMove = cursor;
+        else
+            m_cursorStop = cursor;
+    }
+

     // start drag action, see enum wxDragResult for return value description
     //
     // if bAllowMove is TRUE, data can be moved, if not - only copied
     virtual wxDragResult DoDragDrop(bool bAllowMove = FALSE) = 0;
 
     // override to give feedback depending on the current operation result
     // start drag action, see enum wxDragResult for return value description
     //
     // if bAllowMove is TRUE, data can be moved, if not - only copied
     virtual wxDragResult DoDragDrop(bool bAllowMove = FALSE) = 0;
 
     // override to give feedback depending on the current operation result

-    // "effect"
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect),
-                               bool WXUNUSED(bScrolling) )
+    // "effect" and return TRUE if you did something, FALSE to let the library
+    // give the default feedback
+    virtual bool GiveFeedback(wxDragResult WXUNUSED(effect)) { return FALSE; }
+
+protected:
+    const wxCursor& GetCursor(wxDragResult res) const

     {
     {

-        return TRUE;
+        if ( res == wxDragCopy )
+            return m_cursorCopy;
+        else if ( res == wxDragMove )
+            return m_cursorMove;
+        else
+            return m_cursorStop;

     }
 
     }
 

-protected:

     wxDataObject *m_data;
     wxDataObject *m_data;

+
+    // the cursors to use for feedback
+    wxCursor      m_cursorCopy, m_cursorMove, m_cursorStop;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -154,10 +187,10 @@ protected:
     #include "wx/msw/ole/droptgt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/dnd.h"
     #include "wx/msw/ole/droptgt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/dnd.h"

+#elif defined(__WXX11__)
+    #include "wx/x11/dnd.h"

 #elif defined(__WXGTK__)
     #include "wx/gtk/dnd.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dnd.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/dnd.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)