Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 1a644eac9adf98947c22303fb676cd3126d41ea0..b9052fe8435a7447dd13f54567f1bd1dac2d9d15 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -3613,7 +3613,9 @@ public:
     /**
         Copy constructor.
     */
     /**
         Copy constructor.
     */

-    wxRichTextFieldType(const wxRichTextFieldType& fieldType) { Copy(fieldType); }
+    wxRichTextFieldType(const wxRichTextFieldType& fieldType)
+        : wxObject(fieldType)
+    { Copy(fieldType); }

 
     void Copy(const wxRichTextFieldType& fieldType) { m_name = fieldType.m_name; }
 
 
     void Copy(const wxRichTextFieldType& fieldType) { m_name = fieldType.m_name; }
 


@@ -3766,7 +3768,9 @@ public:
         The copy constructor.
 
     */
         The copy constructor.
 
     */

-    wxRichTextFieldTypeStandard(const wxRichTextFieldTypeStandard& field) { Copy(field); }
+    wxRichTextFieldTypeStandard(const wxRichTextFieldTypeStandard& field)
+        : wxRichTextFieldType(field)
+    { Copy(field); }

 
     /**
         Initialises the object.
 
     /**
         Initialises the object.


@@ -4233,7 +4237,7 @@ public:
     /**
         Lays out the floating objects.
     */
     /**
         Lays out the floating objects.
     */

-    void LayoutFloat(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, int style, wxRichTextFloatCollector* floatCollector);
+    void LayoutFloat(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style, wxRichTextFloatCollector* floatCollector);

 
 protected:
 
 
 protected: