{
wxSize sz = GetClientSize();
wxRect rect(0, 0, sz.x, sz.y);
-
+
if (event.GetDC())
{
wxGetApp().TileBitmap(rect, *(event.GetDC()), wxGetApp().GetBackgroundBitmap());
delete m_dragImage;
m_dragImage = NULL;
- wxClientDC dc(this);
- if (m_currentlyHighlighted)
- {
- m_currentlyHighlighted->Draw(dc);
- }
- m_draggedShape->SetShow(TRUE);
- m_draggedShape->Draw(dc);
+ m_draggedShape->SetShow(true);
m_currentlyHighlighted = (DragShape*) NULL;
m_draggedShape = (DragShape*) NULL;
+
+ Refresh(true);
}
else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE)
{
delete m_dragImage;
// Erase the dragged shape from the canvas
- m_draggedShape->SetShow(FALSE);
- wxClientDC dc(this);
- EraseShape(m_draggedShape, dc);
- DrawShapes(dc);
+ m_draggedShape->SetShow(false);
+
+ // redraw immediately
+ Refresh(true);
+ Update();
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:
{
- m_dragImage = new wxDragImage(wxString("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:
{
- // 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;
}
}
// The offset between the top-left of the shape image and the current shape position
wxPoint beginDragHotSpot = m_dragStartPos - m_draggedShape->GetPosition();
-
+
// Now we do this inside the implementation: always assume
// coordinates relative to the capture window (client coordinates)
//if (fullScreen)
// beginDragHotSpot -= ClientToScreen(wxPoint(0, 0));
-
+
if (!m_dragImage->BeginDrag(beginDragHotSpot, this, fullScreen))
{
delete m_dragImage;
m_dragImage = (wxDragImage*) NULL;
m_dragMode = TEST_DRAG_NONE;
-
+
} else
{
m_dragImage->Move(event.GetPosition());
// We're currently dragging. See if we're over another shape.
DragShape* onShape = FindShape(event.GetPosition());
- bool mustUnhighlightOld = FALSE;
- bool mustHighlightNew = FALSE;
+ bool mustUnhighlightOld = false;
+ bool mustHighlightNew = false;
if (m_currentlyHighlighted)
{
if ((onShape == (DragShape*) NULL) || (m_currentlyHighlighted != onShape))
- mustUnhighlightOld = TRUE;
+ mustUnhighlightOld = true;
}
if (onShape && (onShape != m_currentlyHighlighted) && onShape->IsShown())
- mustHighlightNew = TRUE;
+ mustHighlightNew = true;
if (mustUnhighlightOld || mustHighlightNew)
m_dragImage->Hide();
-
+
// Now with the drag image switched off, we can change the window contents.
-
if (mustUnhighlightOld)
- {
- wxClientDC clientDC(this);
- m_currentlyHighlighted->Draw(clientDC);
m_currentlyHighlighted = (DragShape*) NULL;
- }
+
if (mustHighlightNew)
- {
- wxClientDC clientDC(this);
m_currentlyHighlighted = onShape;
- m_currentlyHighlighted->Draw(clientDC, wxINVERT);
+
+ if (mustUnhighlightOld || mustHighlightNew)
+ {
+ Refresh(mustUnhighlightOld);
+ Update();
}
// Move and show the image again
void MyCanvas::DrawShapes(wxDC& dc)
{
- wxNode* node = m_displayList.First();
+ wxList::compatibility_iterator node = m_displayList.GetFirst();
while (node)
{
- DragShape* shape = (DragShape*) node->Data();
- if (shape->IsShown())
- shape->Draw(dc);
- node = node->Next();
+ DragShape* shape = (DragShape*) node->GetData();
+ if (shape->IsShown() && m_draggedShape != shape)
+ {
+ shape->Draw(dc, (m_currentlyHighlighted == shape));
+ }
+ node = node->GetNext();
}
}
wxRect rect2(shape->GetRect());
dc.SetClippingRegion(rect2.x, rect2.y, rect2.width, rect2.height);
-
+
wxGetApp().TileBitmap(rect, dc, wxGetApp().GetBackgroundBitmap());
dc.DestroyClippingRegion();
void MyCanvas::ClearShapes()
{
- wxNode* node = m_displayList.First();
+ wxList::compatibility_iterator node = m_displayList.GetFirst();
while (node)
{
- DragShape* shape = (DragShape*) node->Data();
+ DragShape* shape = (DragShape*) node->GetData();
delete shape;
- node = node->Next();
+ node = node->GetNext();
}
m_displayList.Clear();
}
DragShape* MyCanvas::FindShape(const wxPoint& pt) const
{
- wxNode* node = m_displayList.First();
+ wxList::compatibility_iterator node = m_displayList.GetFirst();
while (node)
{
- DragShape* shape = (DragShape*) node->Data();
+ DragShape* shape = (DragShape*) node->GetData();
if (shape->HitTest(pt))
return shape;
- node = node->Next();
+ node = node->GetNext();
}
return (DragShape*) NULL;
}
END_EVENT_TABLE()
MyFrame::MyFrame()
- : wxFrame( (wxFrame *)NULL, -1, "wxDragImage sample",
- wxPoint(20,20), wxSize(470,360) )
+: wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxDragImage sample"),
+ wxPoint(20,20), wxSize(470,360) )
{
- wxMenu *file_menu = new wxMenu();
- file_menu->Append( wxID_ABOUT, "&About...");
- file_menu->Append( TEST_USE_SCREEN, "&Use whole screen for dragging", "Use whole screen", TRUE);
- file_menu->Append( wxID_EXIT, "E&xit");
+ wxMenu *file_menu = new wxMenu();
+ file_menu->Append( wxID_ABOUT, _T("&About..."));
+ file_menu->AppendCheckItem( TEST_USE_SCREEN, _T("&Use whole screen for dragging"), _T("Use whole screen"));
+ file_menu->Append( wxID_EXIT, _T("E&xit"));
- wxMenuBar *menu_bar = new wxMenuBar();
- menu_bar->Append(file_menu, "&File");
+ wxMenuBar *menu_bar = new wxMenuBar();
+ menu_bar->Append(file_menu, _T("&File"));
- SetMenuBar( menu_bar );
+ SetIcon(wxICON(mondrian));
+ SetMenuBar( menu_bar );
- CreateStatusBar(2);
- int widths[] = { -1, 100 };
- SetStatusWidths( 2, widths );
+#if wxUSE_STATUSBAR
+ CreateStatusBar(2);
+ int widths[] = { -1, 100 };
+ SetStatusWidths( 2, widths );
+#endif // wxUSE_STATUSBAR
- m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
+ m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
}
void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
{
- Close( TRUE );
+ Close( true );
}
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
{
- (void)wxMessageBox( "wxDragImage demo\n"
- "Julian Smart (c) 2000",
- "About wxDragImage Demo", wxICON_INFORMATION | wxOK );
+ (void)wxMessageBox( _T("wxDragImage demo\n")
+ _T("Julian Smart (c) 2000"),
+ _T("About wxDragImage Demo"),
+ wxICON_INFORMATION | wxOK );
}
//-----------------------------------------------------------------------------
MyApp::MyApp()
{
// Drag across whole screen
- m_useScreen = FALSE;
+ m_useScreen = false;
}
bool MyApp::OnInit()
#endif
wxImage image;
- if (image.LoadFile("backgrnd.png", wxBITMAP_TYPE_PNG))
+ if (image.LoadFile(_T("backgrnd.png"), wxBITMAP_TYPE_PNG))
{
- m_background = image.ConvertToBitmap();
+ m_background = wxBitmap(image);
}
MyFrame *frame = new MyFrame();
- wxString rootName("shape0");
+ wxString rootName(_T("shape0"));
int i;
for (i = 1; i < 4; i++)
{
wxString filename;
filename.Printf(wxT("%s%d.png"), (const wxChar*)rootName, i);
- /* For some reason under wxX11, the 2nd LoadFile in this loop fails, with
- a BadMatch inside CreateFromImage (inside ConvertToBitmap). This happens even if you copy
- the first file over the second file. */
+ /* For some reason under wxX11, the 2nd LoadFile in this loop fails, with
+ a BadMatch inside CreateFromImage (inside ConvertToBitmap). This happens even if you copy
+ the first file over the second file. */
if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
{
- DragShape* newShape = new DragShape(image.ConvertToBitmap());
+ DragShape* newShape = new DragShape(wxBitmap(image));
newShape->SetPosition(wxPoint(i*50, i*50));
if (i == 2)
m_background = bitmap;
#endif
- frame->Show( TRUE );
+ frame->Show( true );
- return TRUE;
+ return true;
}
int MyApp::OnExit()
{
int w = bitmap.GetWidth();
int h = bitmap.GetHeight();
-
+
int i, j;
for (i = rect.x; i < rect.x + rect.width; i += w)
{
for (j = rect.y; j < rect.y + rect.height; j+= h)
dc.DrawBitmap(bitmap, i, j);
}
- return TRUE;
+ return true;
}
-void MyApp::OnUseScreen(wxCommandEvent& event)
+void MyApp::OnUseScreen(wxCommandEvent& WXUNUSED(event))
{
m_useScreen = !m_useScreen;
}
m_pos.x = 0;
m_pos.y = 0;
m_dragMethod = SHAPE_DRAG_BITMAP;
- m_show = TRUE;
-}
-
-DragShape::~DragShape()
-{
+ m_show = true;
}
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())
{
wxMemoryDC memDC;
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;
}
else
- 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;
}
projects / wxWidgets.git / blobdiff