From 5540b06b006428090bc790dd68c780f686f4b06a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 13 Apr 2008 12:28:11 +0000 Subject: [PATCH] fixed incorrect layout width caching in wxHtmlContainerCell (patch #1931479) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlcell.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 8dbdc9e830..25099e75c8 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -755,7 +755,9 @@ void wxHtmlContainerCell::Layout(int w) { wxHtmlCell::Layout(w); - if (m_LastLayout == w) return; + if (m_LastLayout == w) + return; + m_LastLayout = w; // VS: Any attempt to layout with negative or zero width leads to hell, // but we can't ignore such attempts completely, since it sometimes @@ -1011,8 +1013,6 @@ void wxHtmlContainerCell::Layout(int w) m_MaxTotalWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); if (m_Width < MaxLineWidth) m_Width = MaxLineWidth; - - m_LastLayout = w; } void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info, -- 2.45.2