X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cb332c1553bb977cb8db16c19c733684ef72805..5fd67293ffdf3b3007f3aa945325b8d66fc2de8d:/samples/dragimag/dragimag.cpp?ds=inline diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp index 0bd71e6f1b..db5c14b430 100644 --- a/samples/dragimag/dragimag.cpp +++ b/samples/dragimag/dragimag.cpp @@ -135,15 +135,14 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event) m_dragImage->Hide(); m_dragImage->EndDrag(); - delete m_dragImage; - m_dragImage = NULL; + wxDELETE(m_dragImage); m_draggedShape->SetShow(true); m_currentlyHighlighted = (DragShape*) NULL; m_draggedShape = (DragShape*) NULL; - + Refresh(true); } else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE) @@ -203,8 +202,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event) if (!m_dragImage->BeginDrag(beginDragHotSpot, this, fullScreen)) { - delete m_dragImage; - m_dragImage = (wxDragImage*) NULL; + wxDELETE(m_dragImage); m_dragMode = TEST_DRAG_NONE; } else @@ -232,7 +230,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event) if (mustUnhighlightOld || mustHighlightNew) m_dragImage->Hide(); - + // Now with the drag image switched off, we can change the window contents. if (mustUnhighlightOld) m_currentlyHighlighted = (DragShape*) NULL; @@ -477,7 +475,7 @@ bool DragShape::Draw(wxDC& dc, bool highlight) dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(), & memDC, 0, 0, wxCOPY, true); - + if (highlight) { dc.SetPen(*wxWHITE_PEN);