implemented GetLabel() (part of patch 1679337)

[wxWidgets.git] / src / generic / dragimgg.cpp

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index b40140c453e6da513a7d19e132e65d277c9aa98c..7ea5a4fabcb1a2bf923539bffb3f0734f3e5f4f8 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -36,14 +36,11 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
 #define wxUSE_IMAGE_IN_DRAGIMAGE 1
 
-#if wxUSE_IMAGE_IN_DRAGIMAGE
-#include "wx/image.h"
-#endif
-
 #include "wx/generic/dragimgg.h"
 
 // ----------------------------------------------------------------------------
@@ -75,7 +72,11 @@ void wxGenericDragImage::Init()
     m_windowDC = (wxDC*) NULL;
     m_window = (wxWindow*) NULL;
     m_fullScreen = false;
+#ifdef wxHAS_NATIVE_OVERLAY
+    m_dcOverlay = NULL;
+#else
     m_pBackingBitmap = (wxBitmap*) NULL;
+#endif
 }
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -287,10 +288,12 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
         }
     }
 
+#ifndef wxHAS_NATIVE_OVERLAY
     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 // !wxHAS_NATIVE_OVERLAY
 
     if (!m_fullScreen)
     {
@@ -353,12 +356,18 @@ bool wxGenericDragImage::EndDrag()
 
     if (m_windowDC)
     {
+#ifdef wxHAS_NATIVE_OVERLAY
+        m_overlay.Reset();
+#else
         m_windowDC->DestroyClippingRegion();
+#endif
         delete m_windowDC;
         m_windowDC = (wxDC*) NULL;
     }
 
+#ifndef wxHAS_NATIVE_OVERLAY
     m_repairBitmap = wxNullBitmap;
+#endif
 
     return true;
 }
@@ -400,6 +409,7 @@ bool wxGenericDragImage::Show()
         // This is where we restore the backing bitmap, in case
         // something has changed on the window.
 
+#ifndef wxHAS_NATIVE_OVERLAY
         wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
         wxMemoryDC memDC;
         memDC.SelectObject(* backing);
@@ -408,6 +418,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 // !wxHAS_NATIVE_OVERLAY
 
         RedrawImage(m_position - m_offset, m_position - m_offset, false, true);
     }
@@ -449,6 +460,13 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
     if (!m_windowDC)
         return false;
 
+#ifdef wxHAS_NATIVE_OVERLAY
+    wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ;
+    if ( eraseOld )
+        dcoverlay.Clear() ;
+    if (drawNew)
+        DoDrawImage(*m_windowDC, newPos);
+#else // !wxHAS_NATIVE_OVERLAY
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
     if (!backing->Ok())
         return false;
@@ -514,6 +532,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPo
 
     memDCTemp.SelectObject(wxNullBitmap);
     memDC.SelectObject(wxNullBitmap);
+#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY
 
     return true;
 }