simpler define handling

[wxWidgets.git] / src / common / stattextcmn.cpp

diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index 8dce7bed74a4e317d3544df63ead6231c04fd781..9558d2dfdd3531ebf9e4c0922214c157758ffe62 100644 (file)
--- 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;
     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());
 }
 
     return wxControl::Ellipsize(label, dc, mode, sz.GetWidth());
 }