X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e412f8928f8cc7d2f21e093f0305137736e9c639..2ef989c972df0bd023ec3b7252fb91afca55f8ab:/include/wx/generic/dragimgg.h diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h index 6821d22f9f..583cc0a182 100644 --- a/include/wx/generic/dragimgg.h +++ b/include/wx/generic/dragimgg.h @@ -19,10 +19,7 @@ #include "wx/treectrl.h" #include "wx/listctrl.h" #include "wx/log.h" - -#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS -#include "wx/dc.h" -#endif +#include "wx/overlay.h" /* To use this class, create a wxDragImage when you start dragging, for example: @@ -160,14 +157,14 @@ public: // 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) { -#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS -#else - m_pBackingBitmap = bitmap; -#endif - } + void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; } +#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY // Operations //////////////////////////////////////////////////////////////////////////// @@ -251,7 +248,7 @@ protected: wxWindow* m_window; wxDC* m_windowDC; -#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS +#ifdef wxHAS_NATIVE_OVERLAY wxOverlay m_overlay; wxDCOverlay* m_dcOverlay; #else @@ -261,7 +258,7 @@ protected: // (pass to wxGenericDragImage as an efficiency measure) // A temporary bitmap for repairing/redrawing wxBitmap m_repairBitmap; -#endif +#endif // !wxHAS_NATIVE_OVERLAY wxRect m_boundingRect; bool m_fullScreen;