missing commit

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

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 6cf4a3392561f5830686cf9f1d4aba7e54086002..d861987d170cd3b8b28245facdcfa0bfd319ff9c 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
 }
 
@@ -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);
@@ -247,16 +247,16 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
         m_boundingRect = * rect;
 
     m_isDirty = false;
-    m_isDirty = false;
-
-    window->CaptureMouse();
+    m_isShown = false;
 
-    if (m_cursor.Ok())
+    if (m_cursor.IsOk())
     {
         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 +288,7 @@ 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))
+    if (!backing->IsOk() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y))
         (*backing) = wxBitmap(clientSize.x, clientSize.y);
 #endif // !wxHAS_NATIVE_OVERLAY
 
@@ -324,7 +324,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW
 
     wxSize sz = fullScreenRect->GetSize();
 
-    if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
+    if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame))
         fullScreenRect->GetParent()->ClientToScreen(& x, & y);
 
     rect.x = x; rect.y = y;
@@ -345,7 +345,7 @@ bool wxGenericDragImage::EndDrag()
 #endif
             m_window->ReleaseMouse();
 
-        if (m_cursor.Ok() && m_oldCursor.Ok())
+        if (m_cursor.IsOk() && m_oldCursor.IsOk())
         {
             m_window->SetCursor(m_oldCursor);
         }
@@ -358,8 +358,7 @@ bool wxGenericDragImage::EndDrag()
 #else
         m_windowDC->DestroyClippingRegion();
 #endif
-        delete m_windowDC;
-        m_windowDC = (wxDC*) NULL;
+        wxDELETE(m_windowDC);
     }
 
 #ifndef wxHAS_NATIVE_OVERLAY
@@ -373,7 +372,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 +396,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 +434,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
 
@@ -468,7 +467,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
         DoDrawImage(*m_windowDC, newPos);
 #else // !wxHAS_NATIVE_OVERLAY
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
-    if (!backing->Ok())
+    if (!backing->IsOk())
         return false;
 
     wxRect oldRect(GetImageRect(oldPos));
@@ -500,7 +499,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
     // keep reallocating all the time.
     int excess = 50;
 
-    if (!m_repairBitmap.Ok() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight()))
+    if (!m_repairBitmap.IsOk() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight()))
     {
         m_repairBitmap = wxBitmap(fullRect.GetWidth() + excess, fullRect.GetHeight() + excess);
     }
@@ -540,12 +539,12 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
 // Override this if you are using a virtual image (drawing your own image)
 bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const
 {
-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())
     {
         dc.DrawBitmap(m_bitmap, pos.x, pos.y, (m_bitmap.GetMask() != 0));
         return true;
     }
-    else if (m_icon.Ok())
+    else if (m_icon.IsOk())
     {
         dc.DrawIcon(m_icon, pos.x, pos.y);
         return true;
@@ -557,11 +556,11 @@ bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const
 // Override this if you are using a virtual image (drawing your own image)
 wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const
 {
-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())
     {
         return wxRect(pos.x, pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight());
     }
-    else if (m_icon.Ok())
+    else if (m_icon.IsOk())
     {
         return wxRect(pos.x, pos.y, m_icon.GetWidth(), m_icon.GetHeight());
     }