Removed GetId/GetId and changed span storage to be compatible with 3.0. Fixed border control style.

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

include/wx/richtext/richtextbuffer.h

@@ -2746,16 +2746,6 @@ 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
 
     /**
@@ -2854,7 +2844,6 @@ 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)
@@ -5704,7 +5693,7 @@ public:
     /**
         Returns the column span. The default is 1.
     */
-    int GetColSpan() const { return m_colSpan; }
+    int GetColSpan() const;
 
     /**
         Sets the column span.
@@ -5714,7 +5703,7 @@ public:
     /**
         Returns the row span. The default is 1.
     */
-    int GetRowSpan() const { return m_rowSpan; }
+    int GetRowSpan() const;
 
     /**
         Sets the row span.
@@ -5728,8 +5717,6 @@ public:
     void Copy(const wxRichTextCell& obj);
 
 protected:
-    int m_colSpan;
-    int m_rowSpan;
 };
 
 /**