X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..1e26459c5e72eb33485fe9919b2a4aaafd01e76b:/interface/wx/dragimag.h

diff --git a/interface/wx/dragimag.h b/interface/wx/dragimag.h
index c6728c0dd8..9e7d90433a 100644
--- a/interface/wx/dragimag.h
+++ b/interface/wx/dragimag.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxDragImage
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -56,11 +56,8 @@ public:
             Bitmap to be used as the drag image. The bitmap can have a mask.
         @param cursor
             Optional cursor to combine with the image.
-        @param cursorHotspot
-            This parameter is deprecated.
     */
-    wxDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor,
-                const wxPoint& cursorHotspot = wxPoint(0, 0));
+    wxDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor);
     /**
         Constructs a drag image from an icon and optional cursor.
 
@@ -68,15 +65,12 @@ public:
             Icon to be used as the drag image.
         @param cursor
             Optional cursor to combine with the image.
-        @param cursorHotspot
-            This parameter is deprecated.
 
         @beginWxPythonOnly
         This constructor is called wxDragIcon in wxPython.
         @endWxPythonOnly
     */
-    wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor,
-                const wxPoint& cursorHotspot = wxPoint(0, 0));
+    wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor);
     /**
         Constructs a drag image from a text string and optional cursor.
 
@@ -84,15 +78,12 @@ public:
             Text used to construct a drag image.
         @param cursor
             Optional cursor to combine with the image.
-        @param cursorHotspot
-            This parameter is deprecated.
 
         @beginWxPythonOnly
         This constructor is called wxDragString in wxPython.
         @endWxPythonOnly
     */
-    wxDragImage(const wxString& text, const wxCursor& cursor = wxNullCursor,
-                const wxPoint& cursorHotspot = wxPoint(0, 0));
+    wxDragImage(const wxString& text, const wxCursor& cursor = wxNullCursor);
     /**
         Constructs a drag image from the text in the given tree control item,
         and optional cursor.
@@ -121,19 +112,6 @@ public:
         @endWxPythonOnly
     */
     wxDragImage(const wxListCtrl& listCtrl, long id);
-    /**
-        Constructs a drag image an optional cursor. This constructor is only
-        available for wxGenericDragImage, and can be used when the application
-        supplies DoDrawImage() and GetImageRect().
-
-        @param cursor
-            Optional cursor to combine with the image.
-        @param cursorHotspot
-            This parameter is deprecated.
-    */
-    wxDragImage(const wxCursor& cursor = wxNullCursor,
-                const wxPoint& cursorHotspot = wxPoint(0, 0));
-
     /**
         Start dragging the image, in a window or full screen.
 
@@ -192,7 +170,7 @@ public:
         applications to draw their own image instead of using an actual bitmap.
         If you override this function, you must also override GetImageRect().
     */
-    virtual bool DoDrawImage(wxDC& dc, const wxPoint& pos);
+    virtual bool DoDrawImage(wxDC& dc, const wxPoint& pos) const;
 
     /**
         Call this when the drag has finished.
@@ -254,8 +232,8 @@ public:
 
         This function is available in wxGenericDragImage only.
     */
-    bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC,
-                                 const wxRect& sourceRect,
-                                 const wxRect& destRect) const;
+    virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC,
+                                         const wxRect& sourceRect,
+                                         const wxRect& destRect) const;
 };