From 5c3a7f71a6a9d40a64af96b587161adfb54f90af Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 25 Feb 2009 00:09:23 +0000 Subject: [PATCH] fix handling of long lines in wxGridCellAutoWrapStringRenderer git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/gridctrl.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index 8db47ed3cf..3098fd5ad5 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -280,9 +280,19 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid, dc.GetTextExtent(tok, &x, &y); if ( curr_x + x > max_x) { - lines.Add( wxString(thisline) ); - thisline = tok; - curr_x=x; + if ( curr_x == 0 ) + { + // this means that a single token is wider than the maximal + // width -- still use it as is as we need to show at least the + // part of it which fits + lines.Add(tok); + } + else + { + lines.Add(thisline); + thisline = tok; + curr_x = x; + } } else { -- 2.50.0