From 41ce5eff753793c44801ab162b028027ba124a28 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 30 Dec 2008 12:06:54 +0000 Subject: [PATCH] fix MSVC warning about possibly uninitialized variable in Ellipsize() (which indicated possibly incorrect usage of this function) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/stattextcmn.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp index 8dce7bed74..9558d2dfdd 100644 --- a/src/common/stattextcmn.cpp +++ b/src/common/stattextcmn.cpp @@ -324,9 +324,18 @@ wxString wxStaticTextBase::Ellipsize(const wxString& label) const dc.SetFont(GetFont()); wxEllipsizeMode mode; - if (HasFlag(wxST_ELLIPSIZE_START)) mode = wxELLIPSIZE_START; - else if (HasFlag(wxST_ELLIPSIZE_MIDDLE)) mode = wxELLIPSIZE_MIDDLE; - else if (HasFlag(wxST_ELLIPSIZE_END)) mode = wxELLIPSIZE_END; + if ( HasFlag(wxST_ELLIPSIZE_START) ) + mode = wxELLIPSIZE_START; + else if ( HasFlag(wxST_ELLIPSIZE_MIDDLE) ) + mode = wxELLIPSIZE_MIDDLE; + else if ( HasFlag(wxST_ELLIPSIZE_END) ) + mode = wxELLIPSIZE_END; + else + { + wxFAIL_MSG( "should only be called if have one of wxST_ELLIPSIZE_XXX" ); + + return label; + } return wxControl::Ellipsize(label, dc, mode, sz.GetWidth()); } -- 2.45.2