Define wxLongLong_t for Intel compiler.

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

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 761ed468a4a5e00d496cc1f392321a8df51a096c..8a3343a9b20189e44debace1009f234d9a780c1c 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -3563,8 +3563,8 @@ protected:
     covers common needs especially for simple, static fields using text or a bitmap.
 
     Register field types on application initialisation with the static function
     covers common needs especially for simple, static fields using text or a bitmap.
 
     Register field types on application initialisation with the static function

-    wxRichTextParagraphLayoutBox::AddFieldType. They will be deleted automatically
-    on application exit.
+    wxRichTextBuffer::AddFieldType. They will be deleted automatically on 
+    application exit.

 
     An application can write a field to a control with wxRichTextCtrl::WriteField,
     taking a field type, the properties for the field, and optional attributes.
 
     An application can write a field to a control with wxRichTextCtrl::WriteField,
     taking a field type, the properties for the field, and optional attributes.


@@ -3650,8 +3650,8 @@ protected:
     property editing functionality for a field.
 
     Register field types on application initialisation with the static function
     property editing functionality for a field.
 
     Register field types on application initialisation with the static function

-    wxRichTextParagraphLayoutBox::AddFieldType. They will be deleted automatically
-    on application exit.
+    wxRichTextBuffer::AddFieldType. They will be deleted automatically on
+    application exit.

 
     @library{wxrichtext}
     @category{richtext}
 
     @library{wxrichtext}
     @category{richtext}


@@ -5562,6 +5562,14 @@ public:
 
 // Accessors
 
 
 // Accessors
 

+    int GetColspan() const;
+
+    void SetColspan(long span) { GetProperties().SetProperty(wxT("colspan"), span); }
+
+    int GetRowspan() const;
+
+    void SetRowspan(long span) { GetProperties().SetProperty(wxT("rowspan"), span); }
+

 // Operations
 
     virtual wxRichTextObject* Clone() const { return new wxRichTextCell(*this); }
 // Operations
 
     virtual wxRichTextObject* Clone() const { return new wxRichTextCell(*this); }