move the grid-specific workaround for scrollbar hysteresis to wxScrollHelper itself...

[wxWidgets.git] / include / wx / generic / dragimgg.h

diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 6cfcee1bd37617cace7628159bc0edba5b690771..7c1c72a239fa6d35a45b47d3852f585a9657fcd2 100644 (file)
--- a/include/wx/generic/dragimgg.h
+++ b/include/wx/generic/dragimgg.h
@@ -19,6 +19,7 @@
 #include "wx/treectrl.h"
 #include "wx/listctrl.h"
 #include "wx/log.h"
 #include "wx/treectrl.h"
 #include "wx/listctrl.h"
 #include "wx/log.h"

+#include "wx/overlay.h"

 
 /*
   To use this class, create a wxDragImage when you start dragging, for example:
 
 /*
   To use this class, create a wxDragImage when you start dragging, for example:


@@ -87,7 +88,7 @@
  * wxGenericDragImage
  */
 
  * wxGenericDragImage
  */
 

-class WXDLLEXPORT wxGenericDragImage: public wxObject
+class WXDLLIMPEXP_CORE wxGenericDragImage: public wxObject

 {
 public:
 
 {
 public:
 


@@ -100,13 +101,6 @@ public:
         Create(cursor);
     }
 
         Create(cursor);
     }
 

-    // Deprecated version of the above
-    wxGenericDragImage(const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-        Create(cursor, cursorHotspot);
-    }
-

     wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();
     wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();


@@ -114,14 +108,6 @@ public:
         Create(image, cursor);
     }
 
         Create(image, cursor);
     }
 

-    // Deprecated version of the above
-    wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(image, cursor, cursorHotspot);
-    }
-

     wxGenericDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();
     wxGenericDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();


@@ -129,14 +115,6 @@ public:
         Create(image, cursor);
     }
 
         Create(image, cursor);
     }
 

-    // Deprecated version of the above
-    wxGenericDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(image, cursor, cursorHotspot);
-    }
-

     wxGenericDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor)
     {
         Init();
     wxGenericDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor)
     {
         Init();


@@ -144,13 +122,17 @@ public:
         Create(str, cursor);
     }
 
         Create(str, cursor);
     }
 

-    // Deprecated version of the above
-    wxGenericDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot)
-    {
-        Init();
-
-        Create(str, cursor, cursorHotspot);
-    }
+#if WXWIN_COMPATIBILITY_2_6
+    // don't use in new code, use versions without hot spot parameter
+    wxDEPRECATED( wxGenericDragImage(const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( wxGenericDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( wxGenericDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( wxGenericDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
+    wxDEPRECATED( bool Create(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_6

 
 #if wxUSE_TREECTRL
     wxGenericDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
 
 #if wxUSE_TREECTRL
     wxGenericDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)


@@ -170,49 +152,34 @@ public:
     }
 #endif
 
     }
 #endif
 

-    ~wxGenericDragImage();
+    virtual ~wxGenericDragImage();

 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 

+#ifdef wxHAS_NATIVE_OVERLAY
+    // backing store is not used when native overlays are
+    void SetBackingBitmap(wxBitmap* WXUNUSED(bitmap)) { }
+#else

     // For efficiency, tell wxGenericDragImage to use a bitmap that's already
     // created (e.g. from last drag)
     void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; }
     // For efficiency, tell wxGenericDragImage to use a bitmap that's already
     // created (e.g. from last drag)
     void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; }

+#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY

 
     // Operations
     ////////////////////////////////////////////////////////////////////////////
 
     // Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect)
     bool Create(const wxCursor& cursor = wxNullCursor);
 
     // Operations
     ////////////////////////////////////////////////////////////////////////////
 
     // Create a drag image with a virtual image (need to override DoDrawImage, GetImageRect)
     bool Create(const wxCursor& cursor = wxNullCursor);

-    bool Create(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(cursor);
-    }

 
     // Create a drag image from a bitmap and optional cursor
     bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor);
 
     // 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);
 
     // 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);
 
     // 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
 
 #if wxUSE_TREECTRL
     // Create a drag image for the given tree control item


@@ -263,7 +230,7 @@ public:
     // Instead, paint the drag image's backing bitmap to be correct, and leave the window
     // to be updated only when dragging the objects away (thus giving a smoother appearance).
     virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC,
     // Instead, paint the drag image's backing bitmap to be correct, and leave the window
     // to be updated only when dragging the objects away (thus giving a smoother appearance).
     virtual bool UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& destDC,

-        const wxRect& sourceRect, const wxRect& destRect) const;
+                                         const wxRect& sourceRect, const wxRect& destRect) const;

 
     // Erase and redraw simultaneously if possible
     virtual bool RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, bool eraseOld, bool drawNew);
 
     // Erase and redraw simultaneously if possible
     virtual bool RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, bool eraseOld, bool drawNew);


@@ -281,12 +248,17 @@ protected:
     wxWindow*       m_window;
     wxDC*           m_windowDC;
 
     wxWindow*       m_window;
     wxDC*           m_windowDC;
 

+#ifdef wxHAS_NATIVE_OVERLAY
+    wxOverlay       m_overlay;
+    wxDCOverlay*     m_dcOverlay;
+#else

     // Stores the window contents while we're dragging the image around
     wxBitmap        m_backingBitmap;
     wxBitmap*       m_pBackingBitmap; // Pointer to existing backing bitmap
                                       // (pass to wxGenericDragImage as an efficiency measure)
     // A temporary bitmap for repairing/redrawing
     wxBitmap        m_repairBitmap;
     // Stores the window contents while we're dragging the image around
     wxBitmap        m_backingBitmap;
     wxBitmap*       m_pBackingBitmap; // Pointer to existing backing bitmap
                                       // (pass to wxGenericDragImage as an efficiency measure)
     // A temporary bitmap for repairing/redrawing
     wxBitmap        m_repairBitmap;

+#endif // !wxHAS_NATIVE_OVERLAY

 
     wxRect          m_boundingRect;
     bool            m_fullScreen;
 
     wxRect          m_boundingRect;
     bool            m_fullScreen;