Now get/set row_description, column_description, caption use gchar *

rather than AtkObject *

4 files changed, 36 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 289579c..bc9107e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
 	* atk/atktable.h, atk/atktable.c
 	Updated so that get/set row/column header functions
 	work with AtkObjects rather than AtkTables.  Organized
-	the header file a little more cleanly.
+	the header file a little more cleanly.  Also the get/set
+	row_description and caption functions now use gchar *
+	rather than AtkObject.
 
 2001-06-12  Padraig O'Briain  <padraig.obriain@sun.com>
 
diff --git a/atk/atktable.c b/atk/atktable.c
index c88a99a..8ff3171 100755
--- a/atk/atktable.c
+++ b/atk/atktable.c
@@ -214,10 +214,10 @@ atk_table_get_column_at_index (AtkTable *obj,
  * use type checking/interface checking macros or the
  * atk_get_accessible_table() convenience method.
  *
- * Returns: a AtkObject* representing the table caption, or %NULL
+ * Returns: a gchar* representing the table caption, or %NULL
  * if value does not implement this interface.
  **/
-AtkObject*
+gchar*
 atk_table_get_caption (AtkTable *obj)
 {
   AtkTableIface *iface;
@@ -273,10 +273,10 @@ atk_table_get_n_columns (AtkTable *obj)
  * use type checking/interface checking macros or the
  * atk_get_accessible_table() convenience method.
  *
- * Returns: a AtkObject* representing the table description, or NULL
+ * Returns: a gchar* representing the column description, or %NULL
  * if value does not implement this interface.
  **/
-AtkObject*
+gchar*
 atk_table_get_column_description (AtkTable *obj,
                                   gint     column)
 {
@@ -397,10 +397,10 @@ atk_table_get_n_rows (AtkTable *obj)
  * use type checking/interface checking macros or the
  * atk_get_accessible_table() convenience method.
  *
- * Returns: a AtkObject* representing the table description, or %NULL
+ * Returns: a gchar* representing the row description, or %NULL
  * if value does not implement this interface.
  **/
-AtkObject*
+gchar*
 atk_table_get_row_description (AtkTable *obj,
                                gint      row)
 {
@@ -670,13 +670,13 @@ atk_table_is_selected (AtkTable *obj,
 /**
  * atk_table_set_caption:
  * @table: a GObject instance that implements AtkTableIface
- * @accessible: an #AtkObject representing the caption to set for @table
+ * @caption: a #gchar representing the caption to set for @table
  *
  * Sets the caption for the table.
  **/
 void
 atk_table_set_caption (AtkTable       *obj,
-                       AtkObject      *accessible)
+                       gchar          *caption)
 {
   AtkTableIface *iface;
 
@@ -686,14 +686,14 @@ atk_table_set_caption (AtkTable       *obj,
   iface = ATK_TABLE_GET_IFACE (obj);
 
   if (iface->set_caption)
-    (iface->set_caption) (obj, accessible);
+    (iface->set_caption) (obj, caption);
 }
 
 /**
  * atk_table_set_column_description:
  * @table: a GObject instance that implements AtkTableIface
  * @column: a #gint representing a column in @table
- * @accessible: an #AtkObject representing the description text
+ * @description: a #gchar representing the description text
  * to set for the specified @column of the @table
  *
  * Sets the description text for the specified @column of the @table.
@@ -701,7 +701,7 @@ atk_table_set_caption (AtkTable       *obj,
 void
 atk_table_set_column_description (AtkTable       *obj,
                                   gint           column,
-                                  AtkObject      *accessible)
+                                  gchar          *description)
 {
   AtkTableIface *iface;
 
@@ -711,7 +711,7 @@ atk_table_set_column_description (AtkTable       *obj,
   iface = ATK_TABLE_GET_IFACE (obj);
 
   if (iface->set_column_description)
-    (iface->set_column_description) (obj, column, accessible);
+    (iface->set_column_description) (obj, column, description);
 }
 
 /**
@@ -742,7 +742,7 @@ atk_table_set_column_header (AtkTable  *obj,
  * atk_table_set_row_description:
  * @table: a GObject instance that implements AtkTableIface
  * @row: a #gint representing a row in @table
- * @accessible: an #AtkObject representing the description text
+ * @description: a #gchar representing the description text
  * to set for the specified @row of @table
  *
  * Sets the description text for the specified @row of @table.
@@ -750,7 +750,7 @@ atk_table_set_column_header (AtkTable  *obj,
 void
 atk_table_set_row_description (AtkTable       *obj,
                                gint           row,
-                               AtkObject      *accessible)
+                               gchar          *description)
 {
   AtkTableIface *iface;
 
@@ -760,7 +760,7 @@ atk_table_set_row_description (AtkTable       *obj,
   iface = ATK_TABLE_GET_IFACE (obj);
 
   if (iface->set_row_description)
-    (iface->set_row_description) (obj, row, accessible);
+    (iface->set_row_description) (obj, row, description);
 }
 
 /**
diff --git a/atk/atktable.h b/atk/atktable.h
index a7f7dca..c0f8a64 100755
--- a/atk/atktable.h
+++ b/atk/atktable.h
@@ -65,27 +65,27 @@ struct _AtkTableIface
   gint              (* get_row_extent_at)        (AtkTable      *table,
                                                   gint          row,
                                                   gint          column);
-  AtkObject*        (* get_caption)              (AtkTable      *table);
-  AtkObject*        (* get_column_description)   (AtkTable      *table,
+  gchar*            (* get_caption)              (AtkTable      *table);
+  gchar*            (* get_column_description)   (AtkTable      *table,
                                                   gint          column);
   AtkObject*        (* get_column_header)        (AtkTable      *table,
 						  gint		column);
-  AtkObject*        (* get_row_description)      (AtkTable      *table,
+  gchar* 	    (* get_row_description)      (AtkTable      *table,
                                                   gint          row);
   AtkObject*        (* get_row_header)           (AtkTable      *table,
 						  gint		row);
   AtkObject*        (* get_summary)              (AtkTable      *table);
   void              (* set_caption)              (AtkTable      *table,
-                                                  AtkObject     *accessible);
+                                                  gchar		*caption);
   void              (* set_column_description)   (AtkTable      *table,
                                                   gint          column,
-                                                  AtkObject     *accessible);
+                                                  gchar		*description);
   void              (* set_column_header)        (AtkTable      *table,
                                                   gint          column,
                                                   AtkObject     *header);
   void              (* set_row_description)      (AtkTable      *table,
                                                   gint          row,
-                                                  AtkObject     *accessible);
+                                                  gchar		*description);
   void              (* set_row_header)           (AtkTable      *table,
                                                   gint          row,
                                                   AtkObject     *header);
@@ -131,27 +131,27 @@ gint              atk_table_get_column_extent_at (AtkTable         *table,
 gint              atk_table_get_row_extent_at    (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
-AtkObject*        atk_table_get_caption          (AtkTable         *table);
-AtkObject*        atk_table_get_column_description (AtkTable         *table,
+gchar*            atk_table_get_caption          (AtkTable         *table);
+gchar*            atk_table_get_column_description (AtkTable         *table,
                                                     gint             column);
 AtkObject*        atk_table_get_column_header    (AtkTable         *table,
 						  gint		   column);
-AtkObject*        atk_table_get_row_description  (AtkTable         *table,
+gchar*            atk_table_get_row_description  (AtkTable         *table,
                                                   gint             r);
 AtkObject*        atk_table_get_row_header       (AtkTable         *table,
 						  gint		   row);
 AtkObject*        atk_table_get_summary          (AtkTable         *table);
 void              atk_table_set_caption          (AtkTable         *table,
-                                                  AtkObject        *accessible);
+                                                  gchar		   *caption);
 void              atk_table_set_column_description (AtkTable       *table,
                                                     gint           column,
-                                                    AtkObject      *accessible);
+                                                    gchar	   *description);
 void              atk_table_set_column_header    (AtkTable         *table,
                                                   gint             column,
                                                   AtkObject        *header);
 void              atk_table_set_row_description  (AtkTable         *table,
                                                   gint             row,
-                                                  AtkObject        *accessible);
+                                                  gchar		   *description);
 void              atk_table_set_row_header       (AtkTable         *table,
                                                   gint             row,
                                                   AtkObject        *header);
diff --git a/docs/tmpl/atktable.sgml b/docs/tmpl/atktable.sgml
index deaae00..21df909 100644
--- a/docs/tmpl/atktable.sgml
+++ b/docs/tmpl/atktable.sgml
@@ -249,6 +249,8 @@ two-dimensional table format.
 </para>
 
 @table: 
+@caption: 
+<!-- # Unused Parameters # -->
 @accessible: 
 
 
@@ -259,6 +261,8 @@ two-dimensional table format.
 
 @table: 
 @column: 
+@description: 
+<!-- # Unused Parameters # -->
 @accessible: 
 
 
@@ -279,6 +283,8 @@ two-dimensional table format.
 
 @table: 
 @row: 
+@description: 
+<!-- # Unused Parameters # -->
 @accessible: