Rebake all project files to reflect MSVC deprecation warnings defines.

[wxWidgets.git] / samples / dragimag / dragimag.cpp

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 0bd71e6f1b2d612e453c7ff1faadd5ae24406666..ddebcc591617c5153fcedaefc1883028f2d0fe3a 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -87,7 +87,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
 void MyCanvas::OnEraseBackground(wxEraseEvent& event)
 {
-    if (wxGetApp().GetBackgroundBitmap().Ok())
+    if (wxGetApp().GetBackgroundBitmap().IsOk())
     {
         wxSize sz = GetClientSize();
         wxRect rect(0, 0, sz.x, sz.y);
@@ -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;
@@ -320,7 +318,7 @@ MyFrame::MyFrame()
           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();
-    file_menu->Append( wxID_ABOUT, wxT("&About..."));
+    file_menu->Append( wxID_ABOUT, wxT("&About"));
     file_menu->AppendCheckItem( TEST_USE_SCREEN, wxT("&Use whole screen for dragging"), wxT("Use whole screen"));
     file_menu->Append( wxID_EXIT, wxT("E&xit"));
 
@@ -470,14 +468,14 @@ bool DragShape::HitTest(const wxPoint& pt) const
 
 bool DragShape::Draw(wxDC& dc, bool highlight)
 {
-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())
     {
         wxMemoryDC memDC;
         memDC.SelectObject(m_bitmap);
 
         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);
@@ -500,7 +498,7 @@ bool MyDragImage::UpdateBackingFromWindow(wxDC& WXUNUSED(windowDC), wxMemoryDC&
 {
     destDC.SetClippingRegion(destRect);
 
-    if (wxGetApp().GetBackgroundBitmap().Ok())
+    if (wxGetApp().GetBackgroundBitmap().IsOk())
         wxGetApp().TileBitmap(destRect, destDC, wxGetApp().GetBackgroundBitmap());
 
     m_canvas->DrawShapes(destDC);