orderBack puts it behind all windows in its level, including in other apps, so use...

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

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 1992db6c9bed7b07a71f1ae77de8e0bff20e0be8..31dcc04f7a051620446b53eddea702dd796e2961 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -69,13 +69,13 @@ void wxGenericDragImage::Init()
 {
     m_isDirty = false;
     m_isShown = false;
-    m_windowDC = (wxDC*) NULL;
-    m_window = (wxWindow*) NULL;
+    m_windowDC = NULL;
+    m_window = NULL;
     m_fullScreen = false;
 #ifdef wxHAS_NATIVE_OVERLAY
     m_dcOverlay = NULL;
 #else
-    m_pBackingBitmap = (wxBitmap*) NULL;
+    m_pBackingBitmap = NULL;
 #endif
 }
 
@@ -172,7 +172,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
     wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
-    long w = 0, h = 0;
+    wxCoord w = 0, h = 0;
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);
@@ -187,7 +187,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
     dc2.SetFont(font);
     dc2.SetBackground(* wxWHITE_BRUSH);
     dc2.Clear();
-    dc2.SetBackgroundMode(wxTRANSPARENT);
+    dc2.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
     dc2.SetTextForeground(* wxLIGHT_GREY);
     dc2.DrawText(str, 0, 0);
     dc2.DrawText(str, 1, 0);
@@ -249,14 +249,14 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
     m_isDirty = false;
     m_isDirty = false;
 
-    window->CaptureMouse();
-
     if (m_cursor.Ok())
     {
         m_oldCursor = window->GetCursor();
         window->SetCursor(m_cursor);
     }
 
+    window->CaptureMouse();
+
     // Make a copy of the window so we can repair damage done as the image is
     // dragged.
 
@@ -359,7 +359,7 @@ bool wxGenericDragImage::EndDrag()
         m_windowDC->DestroyClippingRegion();
 #endif
         delete m_windowDC;
-        m_windowDC = (wxDC*) NULL;
+        m_windowDC = NULL;
     }
 
 #ifndef wxHAS_NATIVE_OVERLAY
@@ -373,7 +373,7 @@ bool wxGenericDragImage::EndDrag()
 // is non-NULL, or in screen coordinates if NULL.
 bool wxGenericDragImage::Move(const wxPoint& pt)
 {
-    wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Move()") );
+    wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Move()") );
 
     wxPoint pt2(pt);
     if (m_fullScreen)
@@ -397,7 +397,7 @@ bool wxGenericDragImage::Move(const wxPoint& pt)
 
 bool wxGenericDragImage::Show()
 {
-    wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Show()") );
+    wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Show()") );
 
     // Show at the current position
 
@@ -435,7 +435,7 @@ bool wxGenericDragImage::UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& des
 
 bool wxGenericDragImage::Hide()
 {
-    wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Hide()") );
+    wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Hide()") );
 
     // Repair the old position
 
@@ -451,13 +451,16 @@ bool wxGenericDragImage::Hide()
 }
 
 // More efficient: erase and redraw simultaneously if possible
-bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPos,
+bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
+                                     const wxPoint& newPos,
                                      bool eraseOld, bool drawNew)
 {
     if (!m_windowDC)
         return false;
 
 #ifdef wxHAS_NATIVE_OVERLAY
+    wxUnusedVar(oldPos);
+
     wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ;
     if ( eraseOld )
         dcoverlay.Clear() ;