adding overlay implementation for core graphics

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 9ea4a543249e40a33c48c348ca7441a24c0a3173..6821d22f9f422adc04811e7fd423e002f009c37f 100644 (file)
--- a/include/wx/generic/dragimgg.h
+++ b/include/wx/generic/dragimgg.h
@@ -20,6 +20,10 @@
 #include "wx/listctrl.h"
 #include "wx/log.h"
 
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+#include "wx/dc.h"
+#endif
+
 /*
   To use this class, create a wxDragImage when you start dragging, for example:
 
@@ -158,7 +162,12 @@ public:
 
     // 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) { 
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+#else
+        m_pBackingBitmap = bitmap; 
+#endif
+    }
 
     // Operations
     ////////////////////////////////////////////////////////////////////////////
@@ -242,12 +251,17 @@ protected:
     wxWindow*       m_window;
     wxDC*           m_windowDC;
 
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+    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
 
     wxRect          m_boundingRect;
     bool            m_fullScreen;

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 40b92e410b8c3b4ab435d3cf2e664761b88891e3..cb744af382b1e99e7cba57b9be91b9ee7cd2acb3 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -72,7 +72,11 @@ void wxGenericDragImage::Init()
     m_windowDC = (wxDC*) NULL;
     m_window = (wxWindow*) NULL;
     m_fullScreen = false;
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+    m_dcOverlay = NULL;
+#else
     m_pBackingBitmap = (wxBitmap*) NULL;
+#endif
 }
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -284,10 +288,14 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
         }
     }
 
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+    // nothing to setup here
+#else
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
 
     if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y))
         (*backing) = wxBitmap(clientSize.x, clientSize.y);
+#endif
 
     if (!m_fullScreen)
     {
@@ -350,12 +358,20 @@ bool wxGenericDragImage::EndDrag()
 
     if (m_windowDC)
     {
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+        m_overlay.Reset();
+#else
         m_windowDC->DestroyClippingRegion();
+#endif
         delete m_windowDC;
         m_windowDC = (wxDC*) NULL;
     }
 
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+    // nothing to do for overlays
+#else
     m_repairBitmap = wxNullBitmap;
+#endif
 
     return true;
 }
@@ -397,6 +413,9 @@ bool wxGenericDragImage::Show()
         // This is where we restore the backing bitmap, in case
         // something has changed on the window.
 
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+        // overlay will be set up in the drawing routine
+#else
         wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
         wxMemoryDC memDC;
         memDC.SelectObject(* backing);
@@ -405,6 +424,7 @@ bool wxGenericDragImage::Show()
 
         //memDC.Blit(0, 0, m_boundingRect.width, m_boundingRect.height, m_windowDC, m_boundingRect.x, m_boundingRect.y);
         memDC.SelectObject(wxNullBitmap);
+#endif
 
         RedrawImage(m_position - m_offset, m_position - m_offset, false, true);
     }
@@ -446,6 +466,13 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
     if (!m_windowDC)
         return false;
 
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+    wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ;
+    if ( eraseOld )
+        dcoverlay.Clear() ;
+    if (drawNew)
+        DoDrawImage(*m_windowDC, newPos);
+#else
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
     if (!backing->Ok())
         return false;
@@ -511,7 +538,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
 
     memDCTemp.SelectObject(wxNullBitmap);
     memDC.SelectObject(wxNullBitmap);
-
+#endif
     return true;
 }