Don't use non-existent icon in XRC sample.

[wxWidgets.git] / include / wx / richtext / richtextbuffer.h

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 6f79ca90d3258612095245558fd400246559f435..afb4139089a2f51ec752e46ca3e637328e30a213 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -1510,14 +1510,14 @@ protected:
  * TODO: a floating text box
  */
 
  * 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);
 {
     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
 
 
 // Overrideables
 


@@ -1527,6 +1527,10 @@ public:
     /// Lay the item out
     virtual bool Layout(wxDC& dc, const wxRect& rect, int style);
 
     /// 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
 // Accessors
 
 // Operations