diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index 4ac47931de..4d0d3f7b9b 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -1556,6 +1556,8 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextAttr, wxRichTextAttrArray, WXDLLIMPE WX_DECLARE_USER_EXPORTED_OBJARRAY(wxVariant, wxRichTextVariantArray, WXDLLIMPEXP_RICHTEXT); +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRect, wxRichTextRectArray, WXDLLIMPEXP_RICHTEXT); + /** @class wxRichTextProperties A simple property class using wxVariants. This is used to give each rich text object the diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index a5a35b1c07..1ba7c4f859 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -9403,10 +9403,6 @@ bool wxRichTextTable::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wx return true; } -WX_DECLARE_OBJARRAY(wxRect, wxRichTextRectArray); -WX_DEFINE_OBJARRAY(wxRichTextRectArray); - - // Helper function for Layout() that clears the space needed by a cell with rowspan > 1 int GetRowspanDisplacement(const wxRichTextTable* table, int row, int col, int paddingX, const wxArrayInt& colWidths) { @@ -13905,9 +13901,8 @@ void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAtt } WX_DEFINE_OBJARRAY(wxRichTextVariantArray); - -// JACS 2013-01-27 WX_DEFINE_OBJARRAY(wxRichTextAttrArray); +WX_DEFINE_OBJARRAY(wxRichTextRectArray); IMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject)