1. added support for bitmaps with alpha channel

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

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 6233f1525a2c51a37f64424207489ed70d3101d9..7c4bce111da3d7077a22e298802d5791a5f2cc7e 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -5,13 +5,17 @@
 // Modified by:
 // Created:     26.05.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     26.05.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_BASE_
 #define _WX_DND_H_BASE_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DND_H_BASE_
 #define _WX_DND_H_BASE_
 

+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "dndbase.h"
+#endif
+

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


@@ -23,6 +27,17 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

+// flags for wxDropSource::DoDragDrop()
+//
+// NB: wxDrag_CopyOnly must be 0 (== FALSE) and wxDrag_AllowMove must be 1
+//     (== TRUE) for compatibility with the old DoDragDrop(bool) method!
+enum
+{
+    wxDrag_CopyOnly    = 0, // allow only copying
+    wxDrag_AllowMove   = 1, // allow moving (copying is always allowed)
+    wxDrag_DefaultMove = 3  // the default operation is move, not copy
+};
+

 // result of wxDropSource::DoDragDrop() call
 enum wxDragResult
 {
 // result of wxDropSource::DoDragDrop() call
 enum wxDragResult
 {


@@ -30,12 +45,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;

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


@@ -75,8 +91,10 @@ public:
 
     // start drag action, see enum wxDragResult for return value description
     //
 
     // 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;
+    // if flags contains wxDrag_AllowMove, moving (and only copying) data is
+    // allowed, if it contains wxDrag_DefaultMove (which includes the previous
+    // flag), it is even the default operation
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) = 0;

 
     // override to give feedback depending on the current operation result
     // "effect" and return TRUE if you did something, FALSE to let the library
 
     // override to give feedback depending on the current operation result
     // "effect" and return TRUE if you did something, FALSE to let the library


@@ -94,10 +112,15 @@ protected:
             return m_cursorStop;
     }
 
             return m_cursorStop;
     }
 

+    // the data we're dragging

     wxDataObject *m_data;
 
     // the cursors to use for feedback
     wxDataObject *m_data;
 
     // the cursors to use for feedback

-    wxCursor      m_cursorCopy, m_cursorMove, m_cursorStop;
+    wxCursor m_cursorCopy,
+             m_cursorMove,
+             m_cursorStop;
+
+    DECLARE_NO_COPY_CLASS(wxDropSourceBase)

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


@@ -171,6 +194,8 @@ public:
 
 protected:
     wxDataObject *m_dataObject;
 
 protected:
     wxDataObject *m_dataObject;

+
+    DECLARE_NO_COPY_CLASS(wxDropTargetBase)

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


@@ -182,16 +207,14 @@ 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__)
     #include "wx/os2/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dnd.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dnd.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -208,6 +231,9 @@ public:
     virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
 
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
 
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);

+
+private:
+    DECLARE_NO_COPY_CLASS(wxTextDropTarget)

 };
 
 // A drop target which accepts files (dragged from File Manager or Explorer)
 };
 
 // A drop target which accepts files (dragged from File Manager or Explorer)


@@ -221,6 +247,9 @@ public:
                              const wxArrayString& filenames) = 0;
 
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
                              const wxArrayString& filenames) = 0;
 
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);

+
+private:
+    DECLARE_NO_COPY_CLASS(wxFileDropTarget)

 };
 
 #endif // wxUSE_DRAG_AND_DROP
 };
 
 #endif // wxUSE_DRAG_AND_DROP