Compilation fix for VC++ 5 and 6

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

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 3c893f685a53729de758d4d2d880500cc6e393b6..93bc0f1e18329230e2c31d894e23a38b722055a5 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -141,7 +141,7 @@ public:
     // by wxDropTarget and deleted by it automatically. If you don't give it
     // here, you can use SetDataObject() later.
     wxDropTargetBase(wxDataObject *dataObject = (wxDataObject*)NULL)
     // by wxDropTarget and deleted by it automatically. If you don't give it
     // here, you can use SetDataObject() later.
     wxDropTargetBase(wxDataObject *dataObject = (wxDataObject*)NULL)

-        { m_dataObject = dataObject; }
+        { m_dataObject = dataObject; m_defaultAction = wxDragNone; }

     // dtor deletes our data object
     virtual ~wxDropTargetBase()
         { delete m_dataObject; }
     // dtor deletes our data object
     virtual ~wxDropTargetBase()
         { delete m_dataObject; }


@@ -192,8 +192,21 @@ public:
     // with the data from the drop source if it returns true
     virtual bool GetData() = 0;
 
     // with the data from the drop source if it returns true
     virtual bool GetData() = 0;
 

+    // sets the default action for drag and drop:
+    // use wxDragMove or wxDragCopy to set deafult action to move or copy
+    // and use wxDragNone (default) to set default action specified by
+    // initialization of draging (see wxDropSourceBase::DoDragDrop())
+    void SetDefaultAction(wxDragResult action)
+        { m_defaultAction = action; }
+
+    // returns default action for drag and drop or
+    // wxDragNone if this not specified
+    wxDragResult GetDefaultAction()
+        { return m_defaultAction; }
+

 protected:
     wxDataObject *m_dataObject;
 protected:
     wxDataObject *m_dataObject;

+    wxDragResult m_defaultAction;

 
     DECLARE_NO_COPY_CLASS(wxDropTargetBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxDropTargetBase)
 };