don't use deprecated toolbar API

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

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 6723b68a2e4a78f8a726efd39d9a15c08acce949..2da9893cb2f8e0bab5c3994566c50882029dfeed 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -72,7 +72,7 @@ void wxGenericDragImage::Init()
     m_windowDC = (wxDC*) NULL;
     m_window = (wxWindow*) NULL;
     m_fullScreen = false;
-#if wxHAS_NATIVE_OVERLAY
+#ifdef wxHAS_NATIVE_OVERLAY
     m_dcOverlay = NULL;
 #else
     m_pBackingBitmap = (wxBitmap*) NULL;
@@ -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);
@@ -236,7 +236,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
                                    bool fullScreen,
                                    wxRect* rect)
 {
-    wxASSERT_MSG( (window != 0), wxT("Window must not be null in BeginDrag."));
+    wxCHECK_MSG( window, false, wxT("Window must not be null in BeginDrag."));
 
     // The image should be offset by this amount
     m_offset = hotspot;
@@ -249,17 +249,14 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
     m_isDirty = false;
     m_isDirty = false;
 
-    if (window)
+    if (m_cursor.Ok())
     {
-        window->CaptureMouse();
-
-        if (m_cursor.Ok())
-        {
-            m_oldCursor = window->GetCursor();
-            window->SetCursor(m_cursor);
-        }
+        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.
 
@@ -288,7 +285,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
         }
     }
 
-#if !wxHAS_NATIVE_OVERLAY
+#ifndef wxHAS_NATIVE_OVERLAY
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
 
     if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y))
@@ -356,7 +353,7 @@ bool wxGenericDragImage::EndDrag()
 
     if (m_windowDC)
     {
-#if wxHAS_NATIVE_OVERLAY
+#ifdef wxHAS_NATIVE_OVERLAY
         m_overlay.Reset();
 #else
         m_windowDC->DestroyClippingRegion();
@@ -365,7 +362,7 @@ bool wxGenericDragImage::EndDrag()
         m_windowDC = (wxDC*) NULL;
     }
 
-#if !wxHAS_NATIVE_OVERLAY
+#ifndef wxHAS_NATIVE_OVERLAY
     m_repairBitmap = wxNullBitmap;
 #endif
 
@@ -409,7 +406,7 @@ bool wxGenericDragImage::Show()
         // This is where we restore the backing bitmap, in case
         // something has changed on the window.
 
-#if !wxHAS_NATIVE_OVERLAY
+#ifndef wxHAS_NATIVE_OVERLAY
         wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
         wxMemoryDC memDC;
         memDC.SelectObject(* backing);
@@ -454,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;
 
-#if wxHAS_NATIVE_OVERLAY
+#ifdef wxHAS_NATIVE_OVERLAY
+    wxUnusedVar(oldPos);
+
     wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ;
     if ( eraseOld )
         dcoverlay.Clear() ;