Ellipsization can't shorten 1-character string.

It doesn't make sense to attempt to shorten 1 character long string, so
don't do it. Note that 2 characters strings may be shortened (consider
e.g. "mm" in some typefaces).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
old mode 100644 (file)
new mode 100755 (executable)
index da1a63d..444e016
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -255,7 +255,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
 
     wxArrayInt charOffsetsPx;
     size_t len = curLine.length();
 
     wxArrayInt charOffsetsPx;
     size_t len = curLine.length();

-    if (len == 0 ||
+    if (len <= 1 ||

         !dc.GetPartialTextExtents(curLine, charOffsetsPx))
         return curLine;
 
         !dc.GetPartialTextExtents(curLine, charOffsetsPx))
         return curLine;