fix MSVC warnings about possibly uninitialized variables; some reindentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -320,8 +320,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
|
|||||||
|
|
||||||
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++ )
|
||||||
;
|
;
|
||||||
|
|
||||||
@@ -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);
|
||||||
|
Reference in New Issue
Block a user