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

use wxCHECK instead of wxASSERT to avoid crashing later (coverity checker CID 19)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-08 00:09:37 +00:00
parent 641c5f1a97
commit f120af9d56
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/richtext/richtextbuffer.cpp
View File

@@ -589,10 +589,13 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
// Assume this box only contains paragraphs // Assume this box only contains paragraphs
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
wxASSERT (child != NULL); wxCHECK_MSG( child, false, _T("Unknown object in layout") );
// TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines
if (child && !forceQuickLayout && (layoutAll || child->GetLines().GetCount() == 0 || !child->GetRange().IsOutside(invalidRange))) if ( !forceQuickLayout &&
(layoutAll ||
child->GetLines().IsEmpty() ||
!child->GetRange().IsOutside(invalidRange)) )
{ {
child->Layout(dc, availableSpace, style); child->Layout(dc, availableSpace, style);