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

12
src/common/ctrlcmn.cpp
View File

@@ -264,9 +264,9 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
{ {
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; break;
@@ -319,10 +319,9 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
wxASSERT(len > 0); wxASSERT(len > 0);
int maxWidth = totalWidth - excessPixels; int maxWidth = totalWidth - excessPixels;
for (initialChar=0; for ( initialChar = 0;
initialChar < len && initialChar < len && charOffsets[initialChar] < maxWidth;
charOffsets[initialChar] < maxWidth; initialChar++ )
initialChar++)
; ;
if (initialChar == 0) if (initialChar == 0)
@@ -339,6 +338,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
default: default:
wxFAIL_MSG("invalid ellipsize mode"); wxFAIL_MSG("invalid ellipsize mode");
return curLine;
} }
wxString ret(curLine); wxString ret(curLine);