diff options
author | Brian Cameron <bcameron@src.gnome.org> | 2001-06-13 11:14:32 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2001-06-13 11:14:32 +0000 |
commit | 185c94f983996ae63d2d5adbf743a400434913e1 (patch) | |
tree | 93ef9907c527a65385785531c7c4627661609737 | |
parent | 51f3b4ae25be17ad62e0258d36c7825587ad21ab (diff) | |
download | atk-185c94f983996ae63d2d5adbf743a400434913e1.tar.gz |
Updated so that get/set row/column header functions
work with AtkObjects rather than AtkTables. Organized
the header file a little more cleanly.
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | atk/atktable.c | 38 | ||||
-rwxr-xr-x | atk/atktable.h | 86 | ||||
-rw-r--r-- | docs/tmpl/atkeditabletext.sgml | 14 | ||||
-rw-r--r-- | docs/tmpl/atktable.sgml | 23 | ||||
-rw-r--r-- | docs/tmpl/atktext.sgml | 3 |
6 files changed, 100 insertions, 71 deletions
@@ -1,3 +1,10 @@ +2001-06-13 Brian Cameron <brian.cameron@sun.com> + + * 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. + 2001-06-12 Padraig O'Briain <padraig.obriain@sun.com> * atk/atkmarshal.list, atk/atktable.h atk/atktable.c: diff --git a/atk/atktable.c b/atk/atktable.c index 0236a1b..c88a99a 100755 --- a/atk/atktable.c +++ b/atk/atktable.c @@ -330,18 +330,19 @@ atk_table_get_column_extent_at (AtkTable *obj, /** * atk_table_get_column_header: * @table: a GObject instance that implements AtkTableIface + * @column: a #gint representing a column in the table * - * Gets the column headers of an accessible table. + * Gets the column header of a specified column in an accessible table. * Note: callers should not rely on %NULL or on a zero value for * indication of whether AtkSelectionIface is implemented, they should * use type checking/interface checking macros or the * atk_get_accessible_table() convenience method. * - * Returns: a AtkObject* representing the column headers, or %NULL - * if value does not implement this interface. + * Returns: a AtkObject* representing the specified column header, or + * %NULL if value does not implement this interface. **/ -AtkTable* -atk_table_get_column_header (AtkTable *obj) +AtkObject* +atk_table_get_column_header (AtkTable *obj, gint column) { AtkTableIface *iface; @@ -351,7 +352,7 @@ atk_table_get_column_header (AtkTable *obj) iface = ATK_TABLE_GET_IFACE (obj); if (iface->get_column_header) - return (iface->get_column_header) (obj); + return (iface->get_column_header) (obj, column); else return NULL; } @@ -453,18 +454,19 @@ atk_table_get_row_extent_at (AtkTable *obj, /** * atk_table_get_row_header: * @table: a GObject instance that implements AtkTableIface + * @row: a #gint representing a row in the table * - * Gets the row headers of an accessible table. + * Gets the row header of a specified row in an accessible table. * Note: callers should not rely on %NULL or on a zero value for * indication of whether AtkSelectionIface is implemented, they should * use type checking/interface checking macros or the * atk_get_accessible_table() convenience method. * - * Returns: a AtkTable* representing the row headers, or %NULL - * if value does not implement this interface. + * Returns: a AtkObject* representing the specified row header, or + * %NULL if value does not implement this interface. **/ -AtkTable* -atk_table_get_row_header (AtkTable *obj) +AtkObject* +atk_table_get_row_header (AtkTable *obj, gint row) { AtkTableIface *iface; @@ -474,7 +476,7 @@ atk_table_get_row_header (AtkTable *obj) iface = ATK_TABLE_GET_IFACE (obj); if (iface->get_row_header) - return (iface->get_row_header) (obj); + return (iface->get_row_header) (obj, row); else return NULL; } @@ -721,9 +723,9 @@ atk_table_set_column_description (AtkTable *obj, * Sets the specified column header to @header **/ void -atk_table_set_column_header (AtkTable *obj, - gint column, - AtkTable *header) +atk_table_set_column_header (AtkTable *obj, + gint column, + AtkObject *header) { AtkTableIface *iface; @@ -770,9 +772,9 @@ atk_table_set_row_description (AtkTable *obj, * Sets the specified row header to @header **/ void -atk_table_set_row_header (AtkTable *obj, - gint row, - AtkTable *header) +atk_table_set_row_header (AtkTable *obj, + gint row, + AtkObject *header) { AtkTableIface *iface; diff --git a/atk/atktable.h b/atk/atktable.h index 87ab435..a7f7dca 100755 --- a/atk/atktable.h +++ b/atk/atktable.h @@ -53,35 +53,28 @@ struct _AtkTableIface gint (* get_index_at) (AtkTable *table, gint row, gint column); - gint (* get_row_at_index) (AtkTable *table, - gint index); gint (* get_column_at_index) (AtkTable *table, gint index); - AtkObject* (* get_caption) (AtkTable *table); + gint (* get_row_at_index) (AtkTable *table, + gint index); gint (* get_n_columns) (AtkTable *table); - AtkObject* (* get_column_description) (AtkTable *table, - gint column); + gint (* get_n_rows) (AtkTable *table); gint (* get_column_extent_at) (AtkTable *table, gint row, gint column); - AtkTable* (* get_column_header) (AtkTable *table); - gint (* get_n_rows) (AtkTable *table); - AtkObject* (* get_row_description) (AtkTable *table, - gint row); gint (* get_row_extent_at) (AtkTable *table, gint row, gint column); - AtkTable* (* get_row_header) (AtkTable *table); - AtkObject* (* get_summary) (AtkTable *table); - gint* (* get_selected_columns) (AtkTable *table); - gint* (* get_selected_rows) (AtkTable *table); - gboolean (* is_column_selected) (AtkTable *table, + AtkObject* (* get_caption) (AtkTable *table); + AtkObject* (* get_column_description) (AtkTable *table, gint column); - gboolean (* is_row_selected) (AtkTable *table, + AtkObject* (* get_column_header) (AtkTable *table, + gint column); + AtkObject* (* get_row_description) (AtkTable *table, gint row); - gboolean (* is_selected) (AtkTable *table, - gint row, - gint column); + AtkObject* (* get_row_header) (AtkTable *table, + gint row); + AtkObject* (* get_summary) (AtkTable *table); void (* set_caption) (AtkTable *table, AtkObject *accessible); void (* set_column_description) (AtkTable *table, @@ -89,15 +82,24 @@ struct _AtkTableIface AtkObject *accessible); void (* set_column_header) (AtkTable *table, gint column, - AtkTable *header); + AtkObject *header); void (* set_row_description) (AtkTable *table, gint row, AtkObject *accessible); void (* set_row_header) (AtkTable *table, gint row, - AtkTable *header); + AtkObject *header); void (* set_summary) (AtkTable *table, AtkObject *accessible); + gint* (* get_selected_columns) (AtkTable *table); + gint* (* get_selected_rows) (AtkTable *table); + gboolean (* is_column_selected) (AtkTable *table, + gint column); + gboolean (* is_row_selected) (AtkTable *table, + gint row); + gboolean (* is_selected) (AtkTable *table, + gint row, + gint column); /* * signal handlers */ @@ -117,35 +119,28 @@ AtkObject* atk_table_ref_at (AtkTable *table, gint atk_table_get_index_at (AtkTable *table, gint row, gint column); -gint atk_table_get_row_at_index (AtkTable *table, - gint index); gint atk_table_get_column_at_index (AtkTable *table, gint index); -AtkObject* atk_table_get_caption (AtkTable *table); +gint atk_table_get_row_at_index (AtkTable *table, + gint index); gint atk_table_get_n_columns (AtkTable *table); -AtkObject* atk_table_get_column_description (AtkTable *table, - gint column); +gint atk_table_get_n_rows (AtkTable *table); gint atk_table_get_column_extent_at (AtkTable *table, gint row, gint column); -AtkTable* atk_table_get_column_header (AtkTable *table); -gint atk_table_get_n_rows (AtkTable *table); -AtkObject* atk_table_get_row_description (AtkTable *table, - gint r); gint atk_table_get_row_extent_at (AtkTable *table, gint row, gint column); -AtkTable* atk_table_get_row_header (AtkTable *table); +AtkObject* atk_table_get_caption (AtkTable *table); +AtkObject* 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, + gint r); +AtkObject* atk_table_get_row_header (AtkTable *table, + gint row); AtkObject* atk_table_get_summary (AtkTable *table); -gint* atk_table_get_selected_columns (AtkTable *table); -gint* atk_table_get_selected_rows (AtkTable *table); -gboolean atk_table_is_column_selected (AtkTable *table, - gint column); -gboolean atk_table_is_row_selected (AtkTable *table, - gint row); -gboolean atk_table_is_selected (AtkTable *table, - gint row, - gint column); void atk_table_set_caption (AtkTable *table, AtkObject *accessible); void atk_table_set_column_description (AtkTable *table, @@ -153,15 +148,24 @@ void atk_table_set_column_description (AtkTable *table, AtkObject *accessible); void atk_table_set_column_header (AtkTable *table, gint column, - AtkTable *header); + AtkObject *header); void atk_table_set_row_description (AtkTable *table, gint row, AtkObject *accessible); void atk_table_set_row_header (AtkTable *table, gint row, - AtkTable *header); + AtkObject *header); void atk_table_set_summary (AtkTable *table, AtkObject *accessible); +gint* atk_table_get_selected_columns (AtkTable *table); +gint* atk_table_get_selected_rows (AtkTable *table); +gboolean atk_table_is_column_selected (AtkTable *table, + gint column); +gboolean atk_table_is_row_selected (AtkTable *table, + gint row); +gboolean atk_table_is_selected (AtkTable *table, + gint row, + gint column); #ifdef __cplusplus } diff --git a/docs/tmpl/atkeditabletext.sgml b/docs/tmpl/atkeditabletext.sgml index 84327f7..1f9d147 100644 --- a/docs/tmpl/atkeditabletext.sgml +++ b/docs/tmpl/atkeditabletext.sgml @@ -27,7 +27,7 @@ to editing features of editable text widgets. </para> @parent_interface: -@set_attributes: +@set_run_attributes: @set_text_contents: @insert_text: @copy_text: @@ -35,6 +35,18 @@ to editing features of editable text widgets. @delete_text: @paste_text: +<!-- ##### FUNCTION atk_editable_text_set_run_attributes ##### --> +<para> + +</para> + +@text: +@attrib_set: +@start_offset: +@end_offset: +@Returns: + + <!-- ##### FUNCTION atk_editable_text_set_text_contents ##### --> <para> diff --git a/docs/tmpl/atktable.sgml b/docs/tmpl/atktable.sgml index 986273e..deaae00 100644 --- a/docs/tmpl/atktable.sgml +++ b/docs/tmpl/atktable.sgml @@ -29,29 +29,30 @@ two-dimensional table format. @parent: @ref_at: @get_index_at: -@get_row_at_index: @get_column_at_index: -@get_caption: +@get_row_at_index: @get_n_columns: -@get_column_description: +@get_n_rows: @get_column_extent_at: +@get_row_extent_at: +@get_caption: +@get_column_description: @get_column_header: -@get_n_rows: @get_row_description: -@get_row_extent_at: @get_row_header: @get_summary: -@get_selected_columns: -@get_selected_rows: -@is_column_selected: -@is_row_selected: -@is_selected: @set_caption: @set_column_description: @set_column_header: @set_row_description: @set_row_header: @set_summary: +@get_selected_columns: +@get_selected_rows: +@is_column_selected: +@is_row_selected: +@is_selected: +@model_changed: <!-- ##### FUNCTION atk_table_ref_at ##### --> <para> @@ -140,6 +141,7 @@ two-dimensional table format. </para> @table: +@column: @Returns: @@ -179,6 +181,7 @@ two-dimensional table format. </para> @table: +@row: @Returns: diff --git a/docs/tmpl/atktext.sgml b/docs/tmpl/atktext.sgml index 0e2173c..de18fb4 100644 --- a/docs/tmpl/atktext.sgml +++ b/docs/tmpl/atktext.sgml @@ -42,7 +42,6 @@ AtkText provides an accessibility interface for text widgets @remove_selection: @set_selection: @set_caret_offset: -@set_run_attributes: @text_changed: @caret_changed: @@ -134,6 +133,7 @@ AtkText provides an accessibility interface for text widgets @y: @length: @width: +@coords: <!-- ##### FUNCTION atk_text_ref_run_attributes ##### --> @@ -165,6 +165,7 @@ AtkText provides an accessibility interface for text widgets @text: @x: @y: +@coords: @Returns: |