Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just some more minor cleanup in wxSVGFileDC.

Browse Source 
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:
Vadim Zeitlin
2011-04-02 16:38:04 +00:00
parent af58e08750
commit b2a1c6f51b
1 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/dcsvg.cpp
View File

@@ -196,7 +196,6 @@ void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2
} }
CalcBoundingBox(x1, y1); CalcBoundingBox(x1, y1);
CalcBoundingBox(x2, y2); CalcBoundingBox(x2, y2);
return;
} }
void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset ) 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 wxCoord wxSVGFileDCImpl::GetCharHeight() const
{ {
wxScreenDC sDC; wxScreenDC sDC;
sDC.SetFont (m_font); sDC.SetFont (m_font);
return ( sDC.GetCharHeight() ); return sDC.GetCharHeight();
} }
@@ -485,8 +483,7 @@ wxCoord wxSVGFileDCImpl::GetCharWidth() const
wxScreenDC sDC; wxScreenDC sDC;
sDC.SetFont (m_font); sDC.SetFont (m_font);
return ( sDC.GetCharWidth() ); return sDC.GetCharWidth();
} }
@@ -496,16 +493,13 @@ wxCoord wxSVGFileDCImpl::GetCharWidth() const
void wxSVGFileDCImpl::SetBackground( const wxBrush &brush ) void wxSVGFileDCImpl::SetBackground( const wxBrush &brush )
{ {
m_backgroundBrush = brush; m_backgroundBrush = brush;
return;
} }
void wxSVGFileDCImpl::SetBackgroundMode( int mode ) void wxSVGFileDCImpl::SetBackgroundMode( int mode )
{ {
m_backgroundMode = mode; m_backgroundMode = mode;
return;
} }
@@ -545,7 +539,8 @@ void wxSVGFileDCImpl::NewGraphics ()
case wxCAP_ROUND : case wxCAP_ROUND :
default : default :
sPenCap = wxT("stroke-linecap:round; "); sPenCap = wxT("stroke-linecap:round; ");
}; }
switch ( m_pen.GetJoin() ) switch ( m_pen.GetJoin() )
{ {
case wxJOIN_BEVEL : case wxJOIN_BEVEL :
@@ -557,7 +552,7 @@ void wxSVGFileDCImpl::NewGraphics ()
case wxJOIN_ROUND : case wxJOIN_ROUND :
default : default :
sPenJoin = wxT("stroke-linejoin:round; "); sPenJoin = wxT("stroke-linejoin:round; ");
}; }
sLast.Printf( wxT("stroke-width:%d\" \n transform=\"translate(%s %s) scale(%s %s)\">"), 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) ); 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.DrawIcon(myIcon,0,0);
memDC.SelectObject( wxNullBitmap ); memDC.SelectObject( wxNullBitmap );
DoDrawBitmap(myBitmap, x, y); DoDrawBitmap(myBitmap, x, y);
return;
} }
void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) 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); write(s);
} }
m_OK = m_outfile->Ok() && bPNG_OK; m_OK = m_outfile->Ok() && bPNG_OK;
return;
} }
void wxSVGFileDCImpl::write(const wxString &s) void wxSVGFileDCImpl::write(const wxString &s)