From 40ded543dd961962ad18845d9b86dda0e9635b90 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 2 Jul 2001 04:34:26 +0000 Subject: [PATCH] s/signal_newc/signal_new/ to adapt to recent GSignal changes. Mon Jul 2 06:37:09 2001 Tim Janik * atk/atktext.c (atk_text_base_init): * atk/atktable.c (atk_table_base_init): * atk/atkobject.c (atk_object_init): s/signal_newc/signal_new/ to adapt to recent GSignal changes. --- ChangeLog | 7 ++ atk/atkobject.c | 32 ++++----- atk/atktable.c | 126 ++++++++++++++++++------------------ atk/atktext.c | 56 ++++++++-------- docs/tmpl/atk-unused.sgml | 56 ++++++++++++++++ docs/tmpl/atkcomponent.sgml | 13 +++- docs/tmpl/atkeditabletext.sgml | 14 +--- docs/tmpl/atkimage.sgml | 26 +------- docs/tmpl/atkselection.sgml | 4 ++ docs/tmpl/atkstate.sgml | 1 - docs/tmpl/atkstreamablecontent.sgml | 29 --------- docs/tmpl/atktable.sgml | 94 +++++++-------------------- docs/tmpl/atktext.sgml | 28 ++++---- docs/tmpl/atkutil.sgml | 42 ------------ 14 files changed, 224 insertions(+), 304 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72c0f5d..ffcd21d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 2 06:37:09 2001 Tim Janik + + * atk/atktext.c (atk_text_base_init): + * atk/atktable.c (atk_table_base_init): + * atk/atkobject.c (atk_object_init): s/signal_newc/signal_new/ + to adapt to recent GSignal changes. + 2001-06-28 Brian Cameron * atk/atkutil.c atk/atkutil.h docs/atk-sections.txt docs/tmpl/atkutil.sgml diff --git a/atk/atkobject.c b/atk/atkobject.c index ff5290f..42912b9 100755 --- a/atk/atkobject.c +++ b/atk/atkobject.c @@ -285,23 +285,23 @@ atk_object_class_init (AtkObjectClass *klass) * "add" and "remove" */ atk_object_signals[CHILDREN_CHANGED] = - g_signal_newc ("children_changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtkObjectClass, children_changed), - NULL, NULL, - g_cclosure_marshal_VOID__UINT_POINTER, - G_TYPE_NONE, - 2, G_TYPE_UINT, ATK_TYPE_OBJECT); + g_signal_new ("children_changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtkObjectClass, children_changed), + NULL, NULL, + g_cclosure_marshal_VOID__UINT_POINTER, + G_TYPE_NONE, + 2, G_TYPE_UINT, ATK_TYPE_OBJECT); atk_object_signals[FOCUS_EVENT] = - g_signal_newc ("focus_event", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkObjectClass, focus_event), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); + g_signal_new ("focus_event", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkObjectClass, focus_event), + NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, + 1, G_TYPE_BOOLEAN); } static void diff --git a/atk/atktable.c b/atk/atktable.c index 485422f..645106f 100755 --- a/atk/atktable.c +++ b/atk/atktable.c @@ -45,19 +45,19 @@ GType atk_table_get_type () { static GType type = 0; - + if (!type) { GTypeInfo tinfo = { sizeof (AtkTableIface), (GBaseInitFunc) atk_table_base_init, (GBaseFinalizeFunc) NULL, - + }; - + type = g_type_register_static (G_TYPE_INTERFACE, "AtkTable", &tinfo, 0); } - + return type; } @@ -66,65 +66,65 @@ static void atk_table_base_init (gpointer *g_class) { static gboolean initialized = FALSE; - - if (! initialized) - { - atk_table_signals[ROW_INSERTED] = - g_signal_newc ("row_inserted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, row_inserted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); - atk_table_signals[COLUMN_INSERTED] = - g_signal_newc ("column_inserted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, column_inserted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); - atk_table_signals[ROW_DELETED] = - g_signal_newc ("row_deleted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, row_deleted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); - atk_table_signals[COLUMN_DELETED] = - g_signal_newc ("column_deleted", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, column_deleted), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); - atk_table_signals[ROW_REORDERED] = - g_signal_newc ("row_reordered", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, row_reordered), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - atk_table_signals[COLUMN_REORDERED] = - g_signal_newc ("column_reordered", - ATK_TYPE_TABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTableIface, column_reordered), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - initialized = TRUE; - } + + if (!initialized) + { + atk_table_signals[ROW_INSERTED] = + g_signal_new ("row_inserted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, row_inserted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); + atk_table_signals[COLUMN_INSERTED] = + g_signal_new ("column_inserted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, column_inserted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); + atk_table_signals[ROW_DELETED] = + g_signal_new ("row_deleted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, row_deleted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); + atk_table_signals[COLUMN_DELETED] = + g_signal_new ("column_deleted", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, column_deleted), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); + atk_table_signals[ROW_REORDERED] = + g_signal_new ("row_reordered", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, row_reordered), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + atk_table_signals[COLUMN_REORDERED] = + g_signal_new ("column_reordered", + ATK_TYPE_TABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTableIface, column_reordered), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + initialized = TRUE; + } } /** diff --git a/atk/atktext.c b/atk/atktext.c index 1f769a4..ee4cc0b 100755 --- a/atk/atktext.c +++ b/atk/atktext.c @@ -64,36 +64,36 @@ static void atk_text_base_init (gpointer *g_class) { static gboolean initialized = FALSE; - + if (! initialized) { - /* - * Note that text_changed signal supports details "insert", "delete", - * possibly "replace". - */ - - atk_text_signals[TEXT_CHANGED] = - g_signal_newc ("text_changed", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - G_STRUCT_OFFSET (AtkTextIface, text_changed), - (GSignalAccumulator) NULL, NULL, - atk_marshal_VOID__INT_INT, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_INT); - - atk_text_signals[CARET_MOVED] = - g_signal_newc ("text_caret_moved", - ATK_TYPE_TEXT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (AtkTextIface, caret_changed), - (GSignalAccumulator) NULL, NULL, - g_cclosure_marshal_VOID__INT, - G_TYPE_NONE, - 1, G_TYPE_INT); - - initialized = TRUE; - } + /* + * Note that text_changed signal supports details "insert", "delete", + * possibly "replace". + */ + + atk_text_signals[TEXT_CHANGED] = + g_signal_new ("text_changed", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, + G_STRUCT_OFFSET (AtkTextIface, text_changed), + (GSignalAccumulator) NULL, NULL, + atk_marshal_VOID__INT_INT, + G_TYPE_NONE, + 2, G_TYPE_INT, G_TYPE_INT); + + atk_text_signals[CARET_MOVED] = + g_signal_new ("text_caret_moved", + ATK_TYPE_TEXT, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (AtkTextIface, caret_changed), + (GSignalAccumulator) NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, + 1, G_TYPE_INT); + + initialized = TRUE; + } } /** diff --git a/docs/tmpl/atk-unused.sgml b/docs/tmpl/atk-unused.sgml index 5f40b42..1bdf217 100644 --- a/docs/tmpl/atk-unused.sgml +++ b/docs/tmpl/atk-unused.sgml @@ -45,6 +45,15 @@ atk @parent: + + + + + +@listener: +@event_type: +@Returns: + @@ -73,6 +82,27 @@ atk @end_pos: @attributes: + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + @@ -81,6 +111,15 @@ atk @image: @Returns: + + + + + +@image: +@height: +@width: + @@ -89,6 +128,16 @@ atk @image: @Returns: + + + + + +@image: +@x: +@y: +@coord_type: + @@ -97,6 +146,13 @@ atk @image: @Returns: + + + + + +@listener_id: + diff --git a/docs/tmpl/atkcomponent.sgml b/docs/tmpl/atkcomponent.sgml index 24134c6..2cf7841 100644 --- a/docs/tmpl/atkcomponent.sgml +++ b/docs/tmpl/atkcomponent.sgml @@ -34,6 +34,7 @@ representation of an object. @get_accessible_at_point: @get_extents: @get_position: +@get_position_on_screen: @get_size: @grab_focus: @remove_focus_handler: @@ -59,8 +60,9 @@ representation of an object. @component: @x: @y: -@coord_type: @Returns: + +@coord_type: @@ -71,8 +73,9 @@ representation of an object. @component: @x: @y: -@coord_type: @Returns: + +@coord_type: @@ -85,6 +88,7 @@ representation of an object. @y: @width: @height: + @coord_type: @@ -96,6 +100,7 @@ representation of an object. @component: @x: @y: + @coord_type: @@ -115,6 +120,7 @@ representation of an object. @component: + @Returns: @@ -137,6 +143,7 @@ representation of an object. @y: @width: @height: + @coord_type: @Returns: @@ -149,6 +156,7 @@ representation of an object. @component: @x: @y: + @coord_type: @Returns: @@ -161,6 +169,7 @@ representation of an object. @component: @width: @height: + @Returns: diff --git a/docs/tmpl/atkeditabletext.sgml b/docs/tmpl/atkeditabletext.sgml index 1f9d147..84327f7 100644 --- a/docs/tmpl/atkeditabletext.sgml +++ b/docs/tmpl/atkeditabletext.sgml @@ -27,7 +27,7 @@ to editing features of editable text widgets. @parent_interface: -@set_run_attributes: +@set_attributes: @set_text_contents: @insert_text: @copy_text: @@ -35,18 +35,6 @@ to editing features of editable text widgets. @delete_text: @paste_text: - - - - - -@text: -@attrib_set: -@start_offset: -@end_offset: -@Returns: - - diff --git a/docs/tmpl/atkimage.sgml b/docs/tmpl/atkimage.sgml index f564a85..7045bda 100644 --- a/docs/tmpl/atkimage.sgml +++ b/docs/tmpl/atkimage.sgml @@ -28,22 +28,12 @@ an assistive technology to get descriptive information about images. @parent: -@get_position: +@get_storage_type: @get_image_description: -@get_image_size: +@get_image_height: +@get_image_width: @set_image_description: - - - - - -@image: -@x: -@y: -@coord_type: - - @@ -63,13 +53,3 @@ an assistive technology to get descriptive information about images. @Returns: - - - - - -@image: -@height: -@width: - - diff --git a/docs/tmpl/atkselection.sgml b/docs/tmpl/atkselection.sgml index 300a0d8..0169daa 100644 --- a/docs/tmpl/atkselection.sgml +++ b/docs/tmpl/atkselection.sgml @@ -45,6 +45,7 @@ can be selected should support the AtkSelection interface. @selection: @i: + @Returns: @@ -54,6 +55,7 @@ can be selected should support the AtkSelection interface. @selection: + @Returns: @@ -93,6 +95,7 @@ can be selected should support the AtkSelection interface. @selection: @i: + @Returns: @@ -102,6 +105,7 @@ can be selected should support the AtkSelection interface. @selection: + @Returns: diff --git a/docs/tmpl/atkstate.sgml b/docs/tmpl/atkstate.sgml index 8913efc..b7027f3 100644 --- a/docs/tmpl/atkstate.sgml +++ b/docs/tmpl/atkstate.sgml @@ -46,7 +46,6 @@ AtkStates. @ATK_STATE_SENSITIVE: @ATK_STATE_SHOWING: @ATK_STATE_SINGLE_LINE: -@ATK_STATE_STALE: @ATK_STATE_TRANSIENT: @ATK_STATE_VERTICAL: @ATK_STATE_VISIBLE: diff --git a/docs/tmpl/atkstreamablecontent.sgml b/docs/tmpl/atkstreamablecontent.sgml index 65bcdfe..c58b53b 100644 --- a/docs/tmpl/atkstreamablecontent.sgml +++ b/docs/tmpl/atkstreamablecontent.sgml @@ -15,32 +15,3 @@ that contains streamable content. - - - - - -@streamable: -@Returns: - - - - - - - -@streamable: -@i: -@Returns: - - - - - - - -@streamable: -@mime_type: -@Returns: - - diff --git a/docs/tmpl/atktable.sgml b/docs/tmpl/atktable.sgml index e4665fa..57ceb82 100644 --- a/docs/tmpl/atktable.sgml +++ b/docs/tmpl/atktable.sgml @@ -29,39 +29,29 @@ two-dimensional table format. @parent: @ref_at: @get_index_at: -@get_column_at_index: @get_row_at_index: -@get_n_columns: -@get_n_rows: -@get_column_extent_at: -@get_row_extent_at: +@get_column_at_index: @get_caption: +@get_n_columns: @get_column_description: +@get_column_extent_at: @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: -@add_row_selection: -@remove_row_selection: -@add_column_selection: -@remove_column_selection: -@row_inserted: -@column_inserted: -@row_deleted: -@column_deleted: -@row_reordered: -@column_reordered: @@ -180,8 +170,9 @@ two-dimensional table format. @table: -@column: @Returns: + +@column: @@ -190,8 +181,9 @@ two-dimensional table format. @table: -@row: @Returns: + +@row: @@ -209,9 +201,9 @@ two-dimensional table format. @table: -@caption: - @accessible: + +@caption: @@ -221,9 +213,9 @@ two-dimensional table format. @table: @row: -@description: - @accessible: + +@description: @@ -233,9 +225,9 @@ two-dimensional table format. @table: @column: -@description: - @accessible: + +@description: @@ -273,8 +265,9 @@ two-dimensional table format. @table: -@selected: @Returns: + +@selected: @@ -283,8 +276,9 @@ two-dimensional table format. @table: -@selected: @Returns: + +@selected: @@ -318,43 +312,3 @@ two-dimensional table format. @Returns: - - - - - -@table: -@column: -@Returns: - - - - - - - -@table: -@row: -@Returns: - - - - - - - -@table: -@column: -@Returns: - - - - - - - -@table: -@row: -@Returns: - - diff --git a/docs/tmpl/atktext.sgml b/docs/tmpl/atktext.sgml index 705f801..c88f4c8 100644 --- a/docs/tmpl/atktext.sgml +++ b/docs/tmpl/atktext.sgml @@ -32,7 +32,7 @@ AtkText provides an accessibility interface for text widgets @get_character_at_offset: @get_text_before_offset: @get_caret_offset: -@ref_run_attributes: +@get_range_attributes: @get_character_extents: @get_character_count: @get_offset_at_point: @@ -51,6 +51,7 @@ AtkText provides an accessibility interface for text widgets @ATK_TEXT_BOUNDARY_CHAR: +@ATK_TEXT_BOUNDARY_CURSOR_POS: @ATK_TEXT_BOUNDARY_WORD_START: @ATK_TEXT_BOUNDARY_WORD_END: @ATK_TEXT_BOUNDARY_SENTENCE_START: @@ -87,9 +88,10 @@ AtkText provides an accessibility interface for text widgets @text: @offset: @boundary_type: +@Returns: + @startOffset: @endOffset: -@Returns: @@ -100,9 +102,10 @@ AtkText provides an accessibility interface for text widgets @text: @offset: @boundary_type: +@Returns: + @startOffset: @endOffset: -@Returns: @@ -113,9 +116,10 @@ AtkText provides an accessibility interface for text widgets @text: @offset: @boundary_type: +@Returns: + @startOffset: @endOffset: -@Returns: @@ -138,21 +142,10 @@ AtkText provides an accessibility interface for text widgets @y: @length: @width: + @coords: - - - - - -@text: -@offset: -@start_offset: -@end_offset: -@Returns: - - @@ -170,8 +163,9 @@ AtkText provides an accessibility interface for text widgets @text: @x: @y: -@coords: @Returns: + +@coords: diff --git a/docs/tmpl/atkutil.sgml b/docs/tmpl/atkutil.sgml index fd269d4..062101e 100644 --- a/docs/tmpl/atkutil.sgml +++ b/docs/tmpl/atkutil.sgml @@ -47,45 +47,3 @@ The AtkUtility interface provides general purpose utility functions. @object: - - - - - -@listener: -@event_type: -@Returns: - - - - - - - -@listener_id: - - - - - - - -@Returns: - - - - - - - -@Returns: - - - - - - - -@Returns: - - -- 2.7.4