no changes, just deTABbed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
411484436d
commit
caa42c43d0
@ -252,9 +252,9 @@ void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble star
|
||||
|
||||
wxRect2DDouble wxGraphicsPath::GetBox() const
|
||||
{
|
||||
wxDouble x,y,w,h;
|
||||
GetBox(&x,&y,&w,&h);
|
||||
return wxRect2DDouble( x,y,w,h );
|
||||
wxDouble x,y,w,h;
|
||||
GetBox(&x,&y,&w,&h);
|
||||
return wxRect2DDouble( x,y,w,h );
|
||||
}
|
||||
|
||||
bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, int fillStyle ) const
|
||||
@ -625,15 +625,15 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
|
||||
void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush )
|
||||
{
|
||||
wxGraphicsBrush formerBrush = m_brush;
|
||||
wxGraphicsPen formerPen = m_pen;
|
||||
wxGraphicsPen formerPen = m_pen;
|
||||
wxDouble width;
|
||||
wxDouble height;
|
||||
wxDouble descent;
|
||||
wxDouble externalLeading;
|
||||
GetTextExtent( str , &width, &height, &descent, &externalLeading );
|
||||
SetBrush( backgroundBrush );
|
||||
// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
|
||||
SetPen( wxNullGraphicsPen );
|
||||
// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
|
||||
SetPen( wxNullGraphicsPen );
|
||||
|
||||
wxGraphicsPath path = CreatePath();
|
||||
path.AddRectangle( x , y, width, height );
|
||||
@ -641,13 +641,13 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, c
|
||||
|
||||
DrawText( str, x ,y);
|
||||
SetBrush( formerBrush );
|
||||
SetPen( formerPen );
|
||||
SetPen( formerPen );
|
||||
}
|
||||
|
||||
void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush )
|
||||
{
|
||||
wxGraphicsBrush formerBrush = m_brush;
|
||||
wxGraphicsPen formerPen = m_pen;
|
||||
wxGraphicsPen formerPen = m_pen;
|
||||
|
||||
wxDouble width;
|
||||
wxDouble height;
|
||||
@ -655,8 +655,8 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
|
||||
wxDouble externalLeading;
|
||||
GetTextExtent( str , &width, &height, &descent, &externalLeading );
|
||||
SetBrush( backgroundBrush );
|
||||
// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
|
||||
SetPen( wxNullGraphicsPen );
|
||||
// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
|
||||
SetPen( wxNullGraphicsPen );
|
||||
|
||||
wxGraphicsPath path = CreatePath();
|
||||
path.MoveToPoint( x , y );
|
||||
@ -668,7 +668,7 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
|
||||
FillPath( path );
|
||||
DrawText( str, x ,y, angle);
|
||||
SetBrush( formerBrush );
|
||||
SetPen( formerPen );
|
||||
SetPen( formerPen );
|
||||
}
|
||||
|
||||
void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
|
||||
|
Loading…
Reference in New Issue
Block a user