Fixes after stock gdi changes within core library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -233,8 +233,8 @@ bool DiagramCommand::Do(void)
|
|||||||
theShape->AssignNewIds();
|
theShape->AssignNewIds();
|
||||||
theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
|
theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
|
||||||
theShape->SetCentreResize(false);
|
theShape->SetCentreResize(false);
|
||||||
theShape->SetPen(wxBLACK_PEN);
|
theShape->SetPen(*wxBLACK_PEN);
|
||||||
theShape->SetBrush(wxCYAN_BRUSH);
|
theShape->SetBrush(*wxCYAN_BRUSH);
|
||||||
|
|
||||||
theShape->SetSize(60, 60);
|
theShape->SetSize(60, 60);
|
||||||
}
|
}
|
||||||
@@ -302,7 +302,7 @@ bool DiagramCommand::Do(void)
|
|||||||
wxClientDC dc(shape->GetCanvas());
|
wxClientDC dc(shape->GetCanvas());
|
||||||
shape->GetCanvas()->PrepareDC(dc);
|
shape->GetCanvas()->PrepareDC(dc);
|
||||||
|
|
||||||
wxBrush *oldBrush = shape->GetBrush();
|
const wxBrush *oldBrush = shape->GetBrush();
|
||||||
shape->SetBrush(shapeBrush);
|
shape->SetBrush(shapeBrush);
|
||||||
shapeBrush = oldBrush;
|
shapeBrush = oldBrush;
|
||||||
shape->Draw(dc);
|
shape->Draw(dc);
|
||||||
@@ -388,7 +388,7 @@ bool DiagramCommand::Undo(void)
|
|||||||
wxClientDC dc(shape->GetCanvas());
|
wxClientDC dc(shape->GetCanvas());
|
||||||
shape->GetCanvas()->PrepareDC(dc);
|
shape->GetCanvas()->PrepareDC(dc);
|
||||||
|
|
||||||
wxBrush *oldBrush = shape->GetBrush();
|
const wxBrush *oldBrush = shape->GetBrush();
|
||||||
shape->SetBrush(shapeBrush);
|
shape->SetBrush(shapeBrush);
|
||||||
shapeBrush = oldBrush;
|
shapeBrush = oldBrush;
|
||||||
shape->Draw(dc);
|
shape->Draw(dc);
|
||||||
|
Reference in New Issue
Block a user