update code to match 3.0 branch after r78023
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -644,13 +644,12 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
|||||||
m_graphicContext->PushState();
|
m_graphicContext->PushState();
|
||||||
m_graphicContext->Translate(dx, dy);
|
m_graphicContext->Translate(dx, dy);
|
||||||
m_graphicContext->Scale(factor, 1.0);
|
m_graphicContext->Scale(factor, 1.0);
|
||||||
wxGraphicsPath path;
|
wxGraphicsPath path = m_graphicContext->CreatePath();
|
||||||
|
|
||||||
// since these angles (ea,sa) are measured counter-clockwise, we invert them to
|
// since these angles (ea,sa) are measured counter-clockwise, we invert them to
|
||||||
// get clockwise angles
|
// get clockwise angles
|
||||||
if ( m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )
|
if ( m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )
|
||||||
{
|
{
|
||||||
path = m_graphicContext->CreatePath();
|
|
||||||
path.MoveToPoint( 0, 0 );
|
path.MoveToPoint( 0, 0 );
|
||||||
path.AddArc( 0, 0, h/2.0, wxDegToRad(-sa), wxDegToRad(-ea), sa > ea );
|
path.AddArc( 0, 0, h/2.0, wxDegToRad(-sa), wxDegToRad(-ea), sa > ea );
|
||||||
path.AddLineToPoint( 0, 0 );
|
path.AddLineToPoint( 0, 0 );
|
||||||
@@ -662,7 +661,6 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
path = m_graphicContext->CreatePath();
|
|
||||||
path.AddArc( 0, 0, h/2.0, wxDegToRad(-sa), wxDegToRad(-ea), sa > ea );
|
path.AddArc( 0, 0, h/2.0, wxDegToRad(-sa), wxDegToRad(-ea), sa > ea );
|
||||||
m_graphicContext->DrawPath( path );
|
m_graphicContext->DrawPath( path );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user