X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..68a9527d5185cdd9d3fef3d9421415c50de8794d:/include/wx/generic/dragimgg.h?ds=sidebyside diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h index cbfa4afb43..e680ecd305 100644 --- a/include/wx/generic/dragimgg.h +++ b/include/wx/generic/dragimgg.h @@ -13,16 +13,13 @@ #ifndef _WX_DRAGIMGG_H_ #define _WX_DRAGIMGG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "dragimgg.h" -#endif - #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/cursor.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: @@ -30,7 +27,7 @@ void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event) { #ifdef __WXMSW__ - ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWindows + ::UpdateWindow((HWND) GetHWND()); // We need to implement this in wxWidgets #endif CaptureMouse(); @@ -104,13 +101,6 @@ public: 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(); @@ -118,14 +108,6 @@ public: 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(); @@ -133,14 +115,6 @@ public: 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(); @@ -148,80 +122,77 @@ public: 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) { Init(); Create(treeCtrl, id); } +#endif +#if wxUSE_LISTCTRL wxGenericDragImage(const wxListCtrl& listCtrl, long id) { Init(); Create(listCtrl, id); } - ~wxGenericDragImage(); +#endif + + virtual ~wxGenericDragImage(); // Attributes //////////////////////////////////////////////////////////////////////////// // For efficiency, tell wxGenericDragImage to use a bitmap that's already // created (e.g. from last drag) - void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; } + void SetBackingBitmap(wxBitmap* bitmap) { +#ifndef wxHAS_NATIVE_OVERLAY + m_pBackingBitmap = bitmap; +#endif + } // 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); - 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 bool Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id); +#endif +#if wxUSE_LISTCTRL // Create a drag image for the given list control item bool Create(const wxListCtrl& listCtrl, long id); +#endif // 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 = (wxRect*) 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 @@ -258,7 +229,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, - 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); @@ -276,12 +247,17 @@ protected: 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; +#endif // !wxHAS_NATIVE_OVERLAY wxRect m_boundingRect; bool m_fullScreen;