Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert insert=>append change; only for wxELLIPSIZE_END append() is valid

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-08 19:14:56 +00:00
parent 0c36a1d6d4
commit 91d55088c9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/ctrlcmn.cpp
View File

@@ -254,6 +254,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
int excessPixels = totalWidth - maxFinalWidth + int excessPixels = totalWidth - maxFinalWidth +
replacementWidth + replacementWidth +
marginWidth; // security margin (NEEDED!) marginWidth; // security margin (NEEDED!)
wxASSERT(excessPixels>0);
// remove characters in excess // remove characters in excess
size_t initialChar, // index of first char to erase size_t initialChar, // index of first char to erase
@@ -353,7 +354,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
// if there is space for the replacement dots, add them // if there is space for the replacement dots, add them
if (maxFinalWidth > replacementWidth) if (maxFinalWidth > replacementWidth)
ret.append(wxELLIPSE_REPLACEMENT);//.insert(initialChar, wxELLIPSE_REPLACEMENT); ret.insert(initialChar, wxELLIPSE_REPLACEMENT);
} }
// if everything was ok, we should have shortened this line // if everything was ok, we should have shortened this line