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

Reduce the scope of some local variables

Browse Source
This commit is contained in:
Paul Cornett
2019-04-05 10:44:02 -07:00
parent af1cf0a5f3
commit fe1737d399
63 changed files with 163 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/html/htmlcell.cpp
View File

@@ -730,8 +730,8 @@ void wxHtmlContainerCell::Layout(int w)
wxHtmlCell *nextCell;
long xpos = 0, ypos = m_IndentTop;
int xdelta = 0, ybasicpos = 0, ydiff;
int s_width, nextWordWidth, s_indent;
int xdelta = 0, ybasicpos = 0;
int s_width, s_indent;
int ysizeup = 0, ysizedown = 0;
int MaxLineWidth = 0;
int curLineWidth = 0;
@@ -784,6 +784,7 @@ void wxHtmlContainerCell::Layout(int w)
case wxHTML_ALIGN_BOTTOM : ybasicpos = - cell->GetHeight(); break;
case wxHTML_ALIGN_CENTER : ybasicpos = - cell->GetHeight() / 2; break;
}
int ydiff;
ydiff = cell->GetHeight() + ybasicpos;
if (cell->GetDescent() + ydiff > ysizedown) ysizedown = cell->GetDescent() + ydiff;
@@ -809,6 +810,7 @@ void wxHtmlContainerCell::Layout(int w)
cell = cell->GetNext();
// compute length of the next word that would be added:
int nextWordWidth;
nextWordWidth = 0;
if (cell)
{
@@ -1322,9 +1324,9 @@ wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
{
if ( m_Cells )
{
wxHtmlCell *c2;
for (wxHtmlCell *c = m_Cells; c; c = c->GetNext())
{
wxHtmlCell *c2;
c2 = c->GetFirstTerminal();
if ( c2 )
return c2;