Patch from Bo for recent API changes

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

diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 72dde38d4d8cf92e56fbbc888d0f6536bd64f6da..583cc0a182a0822fa7178d0f06b10e2e4cbbdaa3 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:


@@ -151,14 +152,19 @@ 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
     ////////////////////////////////////////////////////////////////////////////
 
     // Operations
     ////////////////////////////////////////////////////////////////////////////


@@ -242,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;