Split this out from other changes to keep things sane..
wxDeprecated KeyCode. wxDeprecated old wxList compat methods. Replaced a large number of them in the gtk build already, but there are still plenty more so feel free to help nuke them as you find them. s/^I/ / and s/TRUE/true/ etc. a couple of these too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -270,13 +270,13 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
|
||||
|
||||
void MyCanvas::DrawShapes(wxDC& dc)
|
||||
{
|
||||
wxNode* node = m_displayList.First();
|
||||
wxNode* node = m_displayList.GetFirst();
|
||||
while (node)
|
||||
{
|
||||
DragShape* shape = (DragShape*) node->Data();
|
||||
DragShape* shape = (DragShape*) node->GetData();
|
||||
if (shape->IsShown())
|
||||
shape->Draw(dc);
|
||||
node = node->Next();
|
||||
node = node->GetNext();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -295,25 +295,25 @@ void MyCanvas::EraseShape(DragShape* shape, wxDC& dc)
|
||||
|
||||
void MyCanvas::ClearShapes()
|
||||
{
|
||||
wxNode* node = m_displayList.First();
|
||||
wxNode* 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();
|
||||
wxNode* 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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user