X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e412f8928f8cc7d2f21e093f0305137736e9c639..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/generic/dragimgg.h

diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 6821d22f9f..f37a9abcc1 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:
@@ -91,7 +88,7 @@
  * wxGenericDragImage
  */
 
-class WXDLLEXPORT wxGenericDragImage: public wxObject
+class WXDLLIMPEXP_CORE wxGenericDragImage: public wxObject
 {
 public:
 
@@ -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
     ////////////////////////////////////////////////////////////////////////////
@@ -196,7 +193,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
@@ -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,14 +258,14 @@ 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;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)
-    DECLARE_NO_COPY_CLASS(wxGenericDragImage)
+    wxDECLARE_NO_COPY_CLASS(wxGenericDragImage);
 };
 
 #endif