X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/msw/dragimag.h?ds=sidebyside

diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index 5f75e6b97a..e08723511a 100644
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -5,17 +5,14 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/04/99
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DRAGIMAG_H_
 #define _WX_DRAGIMAG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dragimag.h"
-#endif
+#if wxUSE_DRAGIMAGE
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
@@ -101,7 +98,7 @@
  * wxDragImage
  */
 
-class WXDLLEXPORT wxDragImage: public wxObject
+class WXDLLIMPEXP_CORE wxDragImage: public wxObject
 {
 public:
 
@@ -116,14 +113,6 @@ public:
         Create(image, cursor);
     }
 
-    // Deprecated form of the above
-    wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(image, cursor, cursorHotspot);
-    }
-
     wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();
@@ -131,14 +120,6 @@ public:
         Create(image, cursor);
     }
 
-    // Deprecated form of the above
-    wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(image, cursor, cursorHotspot);
-    }
-
     wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor)
     {
         Init();
@@ -146,14 +127,6 @@ public:
         Create(str, cursor);
     }
 
-    // Deprecated form of the above
-    wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(str, cursor, cursorHotspot);
-    }
-
 #if wxUSE_TREECTRL
     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
@@ -172,7 +145,7 @@ public:
     }
 #endif
 
-    ~wxDragImage();
+    virtual ~wxDragImage();
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
@@ -182,27 +155,12 @@ public:
 
     // Create a drag image from a bitmap and optional cursor
     bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor);
-    bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-    {
-        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
-        return Create(image, cursor);
-    }
 
     // Create a drag image from an icon and optional cursor
     bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor);
-    bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-    {
-        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
-        return Create(image, cursor);
-    }
 
     // Create a drag image from a string and optional cursor
     bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor);
-    bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-    {
-        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
-        return Create(str, cursor);
-    }
 
 #if wxUSE_TREECTRL
     // Create a drag image for the given tree control item
@@ -216,7 +174,7 @@ public:
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.
-    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = FALSE, wxRect* rect = (wxRect*) NULL);
+    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = NULL);
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the
@@ -250,6 +208,16 @@ public:
     WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; }
 #endif
 
+    // don't use in new code, use versions without hot spot parameter
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+#endif // WXWIN_COMPATIBILITY_2_8
+
 protected:
     WXHIMAGELIST    m_hImageList;
 
@@ -268,8 +236,9 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
-    DECLARE_NO_COPY_CLASS(wxDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxDragImage);
 };
 
+#endif // wxUSE_DRAGIMAGE
 #endif
     // _WX_DRAGIMAG_H_