rebaked after adding threads/atomic.cpp

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 974ffe93391f081e6d83b74db94a8047ab62c62c..88881823a34183f4323706f0984ece348b210150 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -138,17 +138,13 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
         delete m_dragImage;
         m_dragImage = NULL;
 
         delete m_dragImage;
         m_dragImage = NULL;
 

-        wxClientDC dc(this);
-        if (m_currentlyHighlighted)
-        {
-            m_currentlyHighlighted->Draw(dc);
-        }

         m_draggedShape->SetShow(true);
         m_draggedShape->SetShow(true);

-        m_draggedShape->Draw(dc);

 
         m_currentlyHighlighted = (DragShape*) NULL;
 
         m_draggedShape = (DragShape*) NULL;
 
         m_currentlyHighlighted = (DragShape*) NULL;
 
         m_draggedShape = (DragShape*) NULL;

+        
+        Refresh(true);

     }
     else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE)
     {
     }
     else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE)
     {


@@ -170,33 +166,26 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
             // Erase the dragged shape from the canvas
             m_draggedShape->SetShow(false);
 
             // Erase the dragged shape from the canvas
             m_draggedShape->SetShow(false);

-            wxClientDC dc(this);
-            EraseShape(m_draggedShape, dc);
-            DrawShapes(dc);
+
+            // redraw immediately
+            Refresh(true);
+            Update();

 
             switch (m_draggedShape->GetDragMethod())
             {
                 case SHAPE_DRAG_BITMAP:
                 {
 
             switch (m_draggedShape->GetDragMethod())
             {
                 case SHAPE_DRAG_BITMAP:
                 {

-                    m_dragImage = new wxDragImage(m_draggedShape->GetBitmap(), wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new MyDragImage(this, m_draggedShape->GetBitmap(), wxCursor(wxCURSOR_HAND));

                     break;
                 }
                 case SHAPE_DRAG_TEXT:
                 {
                     break;
                 }
                 case SHAPE_DRAG_TEXT:
                 {

-                    m_dragImage = new wxDragImage(wxString(_T("Dragging some test text")), wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new MyDragImage(this, wxString(_T("Dragging some test text")), wxCursor(wxCURSOR_HAND));

                     break;
                 }
                 case SHAPE_DRAG_ICON:
                 {
                     break;
                 }
                 case SHAPE_DRAG_ICON:
                 {

-                    // Can anyone explain why this test is necessary,
-                    // to prevent a gcc error?
-#if defined(__WXMOTIF__) || defined(__WXX11__)
-                    wxIcon icon(dragicon_xpm);
-#else
-                    wxIcon icon(wxICON(dragicon));
-#endif
-
-                    m_dragImage = new wxDragImage(icon, wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new MyDragImage(this, wxICON(dragicon), wxCursor(wxCURSOR_HAND));

                     break;
                 }
             }
                     break;
                 }
             }


@@ -243,20 +232,18 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
             if (mustUnhighlightOld || mustHighlightNew)
                 m_dragImage->Hide();
 
             if (mustUnhighlightOld || mustHighlightNew)
                 m_dragImage->Hide();

-
+            

             // Now with the drag image switched off, we can change the window contents.
             // Now with the drag image switched off, we can change the window contents.

-

             if (mustUnhighlightOld)
             if (mustUnhighlightOld)

-            {
-                wxClientDC clientDC(this);
-                m_currentlyHighlighted->Draw(clientDC);

                 m_currentlyHighlighted = (DragShape*) NULL;
                 m_currentlyHighlighted = (DragShape*) NULL;

-            }
+

             if (mustHighlightNew)
             if (mustHighlightNew)

-            {
-                wxClientDC clientDC(this);

                 m_currentlyHighlighted = onShape;
                 m_currentlyHighlighted = onShape;

-                m_currentlyHighlighted->Draw(clientDC, wxINVERT);
+
+            if (mustUnhighlightOld || mustHighlightNew)
+            {
+                Refresh(mustUnhighlightOld);
+                Update();

             }
 
             // Move and show the image again
             }
 
             // Move and show the image again


@@ -274,8 +261,10 @@ void MyCanvas::DrawShapes(wxDC& dc)
     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();
     while (node)
     {
         DragShape* shape = (DragShape*) node->GetData();

-        if (shape->IsShown())
-          shape->Draw(dc);
+        if (shape->IsShown() && m_draggedShape != shape)
+        {
+            shape->Draw(dc, (m_currentlyHighlighted == shape));
+        }

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -379,6 +368,9 @@ MyApp::MyApp()
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

 #if wxUSE_LIBPNG
     wxImage::AddHandler( new wxPNGHandler );
 #endif
 #if wxUSE_LIBPNG
     wxImage::AddHandler( new wxPNGHandler );
 #endif


@@ -476,10 +468,10 @@ DragShape::DragShape(const wxBitmap& bitmap)
 bool DragShape::HitTest(const wxPoint& pt) const
 {
     wxRect rect(GetRect());
 bool DragShape::HitTest(const wxPoint& pt) const
 {
     wxRect rect(GetRect());

-    return rect.Inside(pt.x, pt.y);
+    return rect.Contains(pt.x, pt.y);

 }
 
 }
 

-bool DragShape::Draw(wxDC& dc, int op)
+bool DragShape::Draw(wxDC& dc, bool highlight)

 {
     if (m_bitmap.Ok())
     {
 {
     if (m_bitmap.Ok())
     {


@@ -487,7 +479,14 @@ bool DragShape::Draw(wxDC& dc, int op)
         memDC.SelectObject(m_bitmap);
 
         dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),
         memDC.SelectObject(m_bitmap);
 
         dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),

-            & memDC, 0, 0, op, true);
+            & memDC, 0, 0, wxCOPY, true);
+            
+        if (highlight)
+        {
+            dc.SetPen(*wxWHITE_PEN);
+            dc.SetBrush(*wxTRANSPARENT_BRUSH);
+            dc.DrawRectangle(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight());
+        }

 
         return true;
     }
 
         return true;
     }


@@ -495,3 +494,19 @@ bool DragShape::Draw(wxDC& dc, int op)
         return false;
 }
 
         return false;
 }
 

+// MyDragImage
+
+// On some platforms, notably Mac OS X with Core Graphics, we can't blit from
+// a window, so we need to draw the background explicitly.
+bool MyDragImage::UpdateBackingFromWindow(wxDC& WXUNUSED(windowDC), wxMemoryDC& destDC, const wxRect& WXUNUSED(sourceRect),
+                    const wxRect& destRect) const
+{
+    destDC.SetClippingRegion(destRect);
+
+    if (wxGetApp().GetBackgroundBitmap().Ok())
+        wxGetApp().TileBitmap(destRect, destDC, wxGetApp().GetBackgroundBitmap());
+
+    m_canvas->DrawShapes(destDC);
+    return true;
+}
+