Fixed a bug that prevented floating objects from being updated correctly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2014-02-13 11:46:59 +00:00
parent 924465f468
commit 46944bebe4

View File

@@ -1747,11 +1747,14 @@ void wxRichTextCompositeObject::Invalidate(const wxRichTextRange& invalidRange)
} }
else if (child->IsTopLevel()) else if (child->IsTopLevel())
{ {
// Not sure why we did this, but it stops updated layout happening for floating objects.
#if 0
if (wxRichTextBuffer::GetFloatingLayoutMode() && child->IsFloating() && GetBuffer()->GetFloatCollector() && GetBuffer()->GetFloatCollector()->HasFloat(child)) if (wxRichTextBuffer::GetFloatingLayoutMode() && child->IsFloating() && GetBuffer()->GetFloatCollector() && GetBuffer()->GetFloatCollector()->HasFloat(child))
{ {
// Don't invalidate subhierarchy if we've already been laid out // Don't invalidate subhierarchy if we've already been laid out
} }
else else
#endif
{ {
if (invalidRange == wxRICHTEXT_NONE) if (invalidRange == wxRICHTEXT_NONE)
child->Invalidate(wxRICHTEXT_NONE); child->Invalidate(wxRICHTEXT_NONE);