Fixed #12566 (assert on deletion) due to inconsistent commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1510,14 +1510,14 @@ protected:
|
||||
* TODO: a floating text box
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_RICHTEXT wxRichTextBox: public wxRichTextParagraphLayoutBox
|
||||
class WXDLLIMPEXP_RICHTEXT wxRichTextBox: public wxRichTextCompositeObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxRichTextBox)
|
||||
public:
|
||||
// Constructors
|
||||
|
||||
wxRichTextBox(wxRichTextObject* parent = NULL);
|
||||
wxRichTextBox(const wxRichTextBox& obj): wxRichTextParagraphLayoutBox() { Copy(obj); }
|
||||
wxRichTextBox(const wxRichTextBox& obj): wxRichTextCompositeObject() { Copy(obj); }
|
||||
|
||||
// Overrideables
|
||||
|
||||
@@ -1527,6 +1527,10 @@ public:
|
||||
/// Lay the item out
|
||||
virtual bool Layout(wxDC& dc, const wxRect& rect, int style);
|
||||
|
||||
/// Get/set the object size for the given range. Returns false if the range
|
||||
/// is invalid for this object.
|
||||
virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position = wxPoint(0,0), wxArrayInt* partialExtents = NULL) const;
|
||||
|
||||
// Accessors
|
||||
|
||||
// Operations
|
||||
|
Reference in New Issue
Block a user