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
2009-02-09 13:16:42 +00:00
parent 70ef48fee3
commit 8d6e8e45fe
1 changed files with 73 additions and 73 deletions
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -320,8 +320,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD

                int maxWidth = totalWidth - excessPixels;
                for ( initialChar = 0;
-                 initialChar < len &&
-                 charOffsets[initialChar] < maxWidth;
+                      initialChar < len && charOffsets[initialChar] < maxWidth;
                      initialChar++ )
                    ;

@@ -339,6 +338,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD

        default:
            wxFAIL_MSG("invalid ellipsize mode");
+            return curLine;
    }

    wxString ret(curLine);