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

Make wxRichTextRectArray usable by other parts of wxRTC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-09-23 09:07:16 +00:00
parent 057945a5cd
commit 4f2d6692c7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/richtext/richtextbuffer.h
View File

@@ -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(wxVariant, wxRichTextVariantArray, WXDLLIMPEXP_RICHTEXT);
WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRect, wxRichTextRectArray, WXDLLIMPEXP_RICHTEXT);
/** /**
@class wxRichTextProperties @class wxRichTextProperties
A simple property class using wxVariants. This is used to give each rich text object the A simple property class using wxVariants. This is used to give each rich text object the

7
src/richtext/richtextbuffer.cpp
View File

@@ -9403,10 +9403,6 @@ bool wxRichTextTable::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wx
return true; 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 // 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) 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); WX_DEFINE_OBJARRAY(wxRichTextVariantArray);
// JACS 2013-01-27
WX_DEFINE_OBJARRAY(wxRichTextAttrArray); WX_DEFINE_OBJARRAY(wxRichTextAttrArray);
WX_DEFINE_OBJARRAY(wxRichTextRectArray);
IMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject)