test

[wxWidgets.git] / include / wx / msw / ole / dropsrc.h

diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h
index aa9283f65cf82e3c067c322403cb4612bf05d1a0..079514324b7b0dffa6ed14bac4b1385e037e8ea2 100644 (file)
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -33,7 +33,7 @@ class WXDLLEXPORT wxWindow;
 // wxDataObject object. It's responsible for giving UI feedback while dragging.
 // ----------------------------------------------------------------------------
 
 // wxDataObject object. It's responsible for giving UI feedback while dragging.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDropSource
+class WXDLLEXPORT wxDropSource : public wxDropSourceBase

 {
 public:
     // ctors: if you use default ctor you must call SetData() later!
 {
 public:
     // ctors: if you use default ctor you must call SetData() later!


@@ -41,12 +41,14 @@ public:
     // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
     //     compatibility, as well as both icon parameters
     wxDropSource(wxWindow *win = NULL,
     // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
     //     compatibility, as well as both icon parameters
     wxDropSource(wxWindow *win = NULL,

-            const wxIcon &go = wxNullIcon,
-            const wxIcon &stop = wxNullIcon );
+                 const wxCursor &cursorCopy = wxNullCursor,
+                 const wxCursor &cursorMove = wxNullCursor,
+                 const wxCursor &cursorStop = wxNullCursor);

     wxDropSource(wxDataObject& data,
     wxDropSource(wxDataObject& data,

-            wxWindow *win = NULL,
-            const wxIcon &go = wxNullIcon,
-            const wxIcon &stop = wxNullIcon );
+                 wxWindow *win = NULL,
+                 const wxCursor &cursorCopy = wxNullCursor,
+                 const wxCursor &cursorMove = wxNullCursor,
+                 const wxCursor &cursorStop = wxNullCursor);

 
     virtual ~wxDropSource();
 
 
     virtual ~wxDropSource();
 


@@ -57,7 +59,7 @@ public:
     // overridable: you may give some custom UI feedback during d&d operation
     // in this function (it's called on each mouse move, so it shouldn't be
     // too slow). Just return false if you want default feedback.
     // overridable: you may give some custom UI feedback during d&d operation
     // in this function (it's called on each mouse move, so it shouldn't be
     // too slow). Just return false if you want default feedback.

-    virtual bool GiveFeedback(wxDragResult effect, bool bScrolling);
+    virtual bool GiveFeedback(wxDragResult effect);

 
 protected:
     void Init();
 
 protected:
     void Init();