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

fix MSVC warnings about possibly uninitialized variables; some reindentation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-09 13:16:42 +00:00
parent 70ef48fee3
commit 8d6e8e45fe
1 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
src/common/ctrlcmn.cpp
View File

@@ -262,83 +262,83 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
switch (mode) switch (mode)
{ {
case wxELLIPSIZE_START: case wxELLIPSIZE_START:
initialChar = 0; initialChar = 0;
for (nChars=0; for ( nChars=0;
nChars < len && charOffsets[nChars] < excessPixels; nChars < len && charOffsets[nChars] < excessPixels;
nChars++) nChars++ )
;
break;
case wxELLIPSIZE_MIDDLE:
{
// the start & end of the removed span of chars
initialChar = len/2;
size_t endChar = len/2;
int removed = 0;
for ( ; removed < excessPixels; )
{
if (initialChar > 0)
{
// width of the initialChar-th character
int width = charOffsets[initialChar] -
charOffsets[initialChar-1];
// remove the initialChar-th character
removed += width;
initialChar--;
}
if (endChar < len - 1 &&
removed < excessPixels)
{
// width of the (endChar+1)-th character
int width = charOffsets[endChar+1] -
charOffsets[endChar];
// remove the endChar-th character
removed += width;
endChar++;
}
if (initialChar == 0 && endChar == len-1)
{
nChars = len+1;
break;
}
}
initialChar++;
nChars = endChar - initialChar + 1;
}
break;
case wxELLIPSIZE_END:
{
wxASSERT(len > 0);
int maxWidth = totalWidth - excessPixels;
for (initialChar=0;
initialChar < len &&
charOffsets[initialChar] < maxWidth;
initialChar++)
; ;
break;
if (initialChar == 0) case wxELLIPSIZE_MIDDLE:
{ {
nChars = len; // the start & end of the removed span of chars
} initialChar = len/2;
else size_t endChar = len/2;
{
//initialChar--; // go back one character
nChars = len - initialChar;
}
}
break;
default: int removed = 0;
wxFAIL_MSG("invalid ellipsize mode"); for ( ; removed < excessPixels; )
{
if (initialChar > 0)
{
// width of the initialChar-th character
int width = charOffsets[initialChar] -
charOffsets[initialChar-1];
// remove the initialChar-th character
removed += width;
initialChar--;
}
if (endChar < len - 1 &&
removed < excessPixels)
{
// width of the (endChar+1)-th character
int width = charOffsets[endChar+1] -
charOffsets[endChar];
// remove the endChar-th character
removed += width;
endChar++;
}
if (initialChar == 0 && endChar == len-1)
{
nChars = len+1;
break;
}
}
initialChar++;
nChars = endChar - initialChar + 1;
}
break;
case wxELLIPSIZE_END:
{
wxASSERT(len > 0);
int maxWidth = totalWidth - excessPixels;
for ( initialChar = 0;
initialChar < len && charOffsets[initialChar] < maxWidth;
initialChar++ )
;
if (initialChar == 0)
{
nChars = len;
}
else
{
//initialChar--; // go back one character
nChars = len - initialChar;
}
}
break;
default:
wxFAIL_MSG("invalid ellipsize mode");
return curLine;
} }
wxString ret(curLine); wxString ret(curLine);