some WXUNUSED() added

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

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 82fb690739cdd2add729cb0ab37a4a7e20a17d56..2106b00a4c25676836b858daee9efd8cc73a7ca8 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -45,8 +45,10 @@ public:
 
     // set the data which is transfered by drag and drop
     void SetData(wxDataObject& data) 
-      { if (m_data) delete m_data; 
-        m_data = &data; }
+      { m_data = &data; }
+      
+    wxDataObject *GetDataObject()
+      { return m_data; }
 
     // start drag action, see enum wxDragResult for return value description
     //
@@ -95,19 +97,28 @@ public:
         { if (m_dataObject) delete m_dataObject; 
          m_dataObject = dataObject; }
 
-    // called when mouse enters/leaves the window: might be used to give
-    // some visual feedback to the user
-    virtual void OnLeave() { }
+    // these functions are called when data is moved over position (x, y) and
+    // may return either wxDragCopy, wxDragMove or wxDragNone depending on
+    // what would happen if the data were dropped here.
+    //
+    // the last parameter is what would happen by default and is determined by
+    // the platform-specific logic (for example, under Windows it's wxDragCopy
+    // if Ctrl key is pressed and wxDragMove otherwise) except that it will
+    // always be wxDragNone if the carried data is in an unsupported format.
+
+    // called when the mouse enters the window (only once until OnLeave())
+    virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
+        { return OnDragOver(x, y, def); }
+
+    // called when the mouse moves in the window - shouldn't take long to
+    // execute or otherwise mouse movement would be too slow
+    virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                                    wxDragResult def)
+        { return def; }
     
-    // this function is called when data enters over position (x, y) - if it
-    // returns TRUE, the dragging icon can indicate that the window would
-    // accept a drop here
-    virtual bool OnEnter(wxCoord x, wxCoord y) = 0;
-
-    // this function is called when data is move over position (x, y) - if it
-    // returns TRUE, the dragging icon can indicate that the window would
-    // accept a drop here
-    virtual bool OnMove(wxCoord x, wxCoord y) = 0;
+    // called when mouse leaves the window: might be used to remove the
+    // feedback which was given in OnEnter()
+    virtual void OnLeave() { }
     
     // this function is called when data is dropped at position (x, y) - if it
     // returns TRUE, OnData() will be called immediately afterwards which will