No real changes, just some more minor cleanup in wxSVGFileDC.
Harmonize spaces, remove unnecessary semicolons, remove useless return statements from void functions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
af58e08750
commit
b2a1c6f51b
@ -196,7 +196,6 @@ void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2
|
||||
}
|
||||
CalcBoundingBox(x1, y1);
|
||||
CalcBoundingBox(x2, y2);
|
||||
return;
|
||||
}
|
||||
|
||||
void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset )
|
||||
@ -471,12 +470,11 @@ void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoor
|
||||
}
|
||||
|
||||
wxCoord wxSVGFileDCImpl::GetCharHeight() const
|
||||
|
||||
{
|
||||
wxScreenDC sDC;
|
||||
sDC.SetFont (m_font);
|
||||
|
||||
return ( sDC.GetCharHeight() );
|
||||
return sDC.GetCharHeight();
|
||||
|
||||
}
|
||||
|
||||
@ -485,8 +483,7 @@ wxCoord wxSVGFileDCImpl::GetCharWidth() const
|
||||
wxScreenDC sDC;
|
||||
sDC.SetFont (m_font);
|
||||
|
||||
return ( sDC.GetCharWidth() );
|
||||
|
||||
return sDC.GetCharWidth();
|
||||
}
|
||||
|
||||
|
||||
@ -496,16 +493,13 @@ wxCoord wxSVGFileDCImpl::GetCharWidth() const
|
||||
|
||||
void wxSVGFileDCImpl::SetBackground( const wxBrush &brush )
|
||||
{
|
||||
|
||||
m_backgroundBrush = brush;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
void wxSVGFileDCImpl::SetBackgroundMode( int mode )
|
||||
{
|
||||
m_backgroundMode = mode;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -545,7 +539,8 @@ void wxSVGFileDCImpl::NewGraphics ()
|
||||
case wxCAP_ROUND :
|
||||
default :
|
||||
sPenCap = wxT("stroke-linecap:round; ");
|
||||
};
|
||||
}
|
||||
|
||||
switch ( m_pen.GetJoin() )
|
||||
{
|
||||
case wxJOIN_BEVEL :
|
||||
@ -557,7 +552,7 @@ void wxSVGFileDCImpl::NewGraphics ()
|
||||
case wxJOIN_ROUND :
|
||||
default :
|
||||
sPenJoin = wxT("stroke-linejoin:round; ");
|
||||
};
|
||||
}
|
||||
|
||||
sLast.Printf( wxT("stroke-width:%d\" \n transform=\"translate(%s %s) scale(%s %s)\">"),
|
||||
m_pen.GetWidth(), NumStr(m_logicalOriginX), NumStr(m_logicalOriginY), NumStr(m_scaleX), NumStr(m_scaleY) );
|
||||
@ -607,7 +602,6 @@ void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord
|
||||
memDC.DrawIcon(myIcon,0,0);
|
||||
memDC.SelectObject( wxNullBitmap );
|
||||
DoDrawBitmap(myBitmap, x, y);
|
||||
return;
|
||||
}
|
||||
|
||||
void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ )
|
||||
@ -650,8 +644,6 @@ void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoor
|
||||
write(s);
|
||||
}
|
||||
m_OK = m_outfile->Ok() && bPNG_OK;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void wxSVGFileDCImpl::write(const wxString &s)
|
||||
|
Loading…
Reference in New Issue
Block a user