Made column and row spans members so they don't interfere with app-defined properties.

Added identifier to wxRichTextObject so objects can be addressed by name.
Generalised wxRICHTEXT_CHANGE_OBJECT command so it can now apply to a paragraph as well as an object within a paragraph.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/richtext/richtextbuffer.h

@@ -2746,6 +2746,16 @@ public:
     */
     bool IsShown() const { return m_show; }
 
+    /**
+        Returns the object's unique identifier, if any.
+    */
+    const wxString& GetId() const { return m_id; }
+
+    /**
+        Sets the object's unique identifier.
+    */
+    void SetId(const wxString& id) { m_id = id; }
+
 // Operations
 
     /**
@@ -2844,6 +2854,7 @@ protected:
     int                     m_descent; // Descent for this object (if any)
     int                     m_refCount;
     bool                    m_show;
+    wxString                m_id;
     wxRichTextObject*       m_parent;
 
     // The range of this object (start position to end position)
@@ -5690,13 +5701,25 @@ public:
 
 // Accessors
 
-    int GetColSpan() const;
+    /**
+        Returns the column span. The default is 1.
+    */
+    int GetColSpan() const { return m_colSpan; }
 
-    void SetColSpan(long span) { GetProperties().SetProperty(wxT("colspan"), span); }
+    /**
+        Sets the column span.
+    */
+    void SetColSpan(int span);
 
-    int GetRowSpan() const;
+    /**
+        Returns the row span. The default is 1.
+    */
+    int GetRowSpan() const { return m_rowSpan; }
 
-    void SetRowSpan(long span) { GetProperties().SetProperty(wxT("rowspan"), span); }
+    /**
+        Sets the row span.
+    */
+    void SetRowSpan(int span);
 
 // Operations
 
@@ -5705,6 +5728,8 @@ public:
     void Copy(const wxRichTextCell& obj);
 
 protected:
+    int m_colSpan;
+    int m_rowSpan;
 };
 
 /**