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

Applied #12941: Fixes and enhancements for wxRTC (Robert Hoffman)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-02-25 11:37:20 +00:00
parent 887b919bde
commit 706465df1f
9 changed files with 704 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/richtext/richtextbuffer.cpp
View File

@@ -1919,7 +1919,8 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
// Assume this box only contains paragraphs
wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
wxCHECK_MSG( child, false, wxT("Unknown object in layout") );
// Unsure if this is needed
// wxCHECK_MSG( child, false, wxT("Unknown object in layout") );
if (child && child->IsShown())
{
@@ -8630,8 +8631,6 @@ bool wxRichTextTable::Layout(wxDC& dc, const wxRect& rect, int style)
wxRichTextCell* cell = GetCell(j, i);
if (cell->IsShown())
{
wxASSERT(colWidths[i] > 0);
// Get max specified cell height
// Don't handle percentages for height
if (cell->GetAttributes().GetTextBoxAttr().GetHeight().IsValid() && cell->GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() != wxTEXT_ATTR_UNITS_PERCENTAGE)