From 2e07b7601c6931eeb38afdf3ce306871e15e98eb Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Mon, 13 Aug 2001 16:02:44 +0000 Subject: [PATCH] atk/atkcomponent.[c|h] docs/atk-sections.txt, docs/tmpl/atkcomponent.sgml * atk/atkcomponent.[c|h] * docs/atk-sections.txt, docs/tmpl/atkcomponent.sgml Change atk_component_get_accessible_at_point to atk_component_ref_accessible_at_point so it will work for flyweights --- ChangeLog | 7 +++++++ atk/atkcomponent.c | 19 +++++++++---------- atk/atkcomponent.h | 4 ++-- docs/atk-sections.txt | 2 +- docs/tmpl/atkcomponent.sgml | 26 +++++++++++++------------- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d1390e..c26e468 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-08-13 Padraig O'Briain + + * atk/atkcomponent.[c|h] + * docs/atk-sections.txt, docs/tmpl/atkcomponent.sgml + Change atk_component_get_accessible_at_point to + atk_component_ref_accessible_at_point so it will work for flyweights + Sun Aug 12 10:33:02 2001 Owen Taylor * docs/Makefile.am: Set GPATH to fix srcdir != builddir problems diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c index a5cd1be..961a68e 100755 --- a/atk/atkcomponent.c +++ b/atk/atkcomponent.c @@ -25,7 +25,7 @@ static gboolean atk_component_real_contains (AtkComponent *comp gint y, AtkCoordType coord_type); -static AtkObject* atk_component_real_get_accessible_at_point (AtkComponent *component, +static AtkObject* atk_component_real_ref_accessible_at_point (AtkComponent *component, gint x, gint y, AtkCoordType coord_type); @@ -143,20 +143,20 @@ atk_component_contains (AtkComponent *component, } /** - * atk_component_get_accessible_at_point: + * atk_component_ref_accessible_at_point: * @component: the #AtkComponent * @x: x coordinate * @y: y coordinate * @coord_type: specifies whether the coordinates are relative to the screen * or to the components top level window * - * Gets the accessible child, if one exists, contained at the + * Gets a reference to the accessible child, if one exists, at the * coordinate point specified by @x and @y. * - * Returns: the accessible child, if one exists + * Returns: a reference to the accessible child, if one exists **/ AtkObject* -atk_component_get_accessible_at_point (AtkComponent *component, +atk_component_ref_accessible_at_point (AtkComponent *component, gint x, gint y, AtkCoordType coord_type) @@ -166,14 +166,14 @@ atk_component_get_accessible_at_point (AtkComponent *component, iface = ATK_COMPONENT_GET_IFACE (component); - if (iface->get_accessible_at_point) - return (iface->get_accessible_at_point) (component, x, y, coord_type); + if (iface->ref_accessible_at_point) + return (iface->ref_accessible_at_point) (component, x, y, coord_type); else { /* * if this method is not overridden use the default implementation. */ - return atk_component_real_get_accessible_at_point (component, x, y, coord_type); + return atk_component_real_ref_accessible_at_point (component, x, y, coord_type); } } @@ -401,7 +401,7 @@ atk_component_real_contains (AtkComponent *component, } static AtkObject* -atk_component_real_get_accessible_at_point (AtkComponent *component, +atk_component_real_ref_accessible_at_point (AtkComponent *component, gint x, gint y, AtkCoordType coord_type) @@ -422,7 +422,6 @@ atk_component_real_get_accessible_at_point (AtkComponent *component, { if (atk_component_contains (ATK_COMPONENT (obj), x, y, coord_type)) { - g_object_unref (obj); return obj; } else diff --git a/atk/atkcomponent.h b/atk/atkcomponent.h index fb3e493..c1b66d0 100755 --- a/atk/atkcomponent.h +++ b/atk/atkcomponent.h @@ -59,7 +59,7 @@ struct _AtkComponentIface gint y, AtkCoordType coord_type); - AtkObject* (* get_accessible_at_point) (AtkComponent *component, + AtkObject* (* ref_accessible_at_point) (AtkComponent *component, gint x, gint y, AtkCoordType coord_type); @@ -104,7 +104,7 @@ gboolean atk_component_contains (AtkComponent *com gint x, gint y, AtkCoordType coord_type); -AtkObject* atk_component_get_accessible_at_point(AtkComponent *component, +AtkObject* atk_component_ref_accessible_at_point(AtkComponent *component, gint x, gint y, AtkCoordType coord_type); diff --git a/docs/atk-sections.txt b/docs/atk-sections.txt index ea07113..805bb63 100644 --- a/docs/atk-sections.txt +++ b/docs/atk-sections.txt @@ -24,11 +24,11 @@ AtkComponent AtkComponentIface atk_component_add_focus_handler atk_component_contains -atk_component_get_accessible_at_point atk_component_get_extents atk_component_get_position atk_component_get_size atk_component_grab_focus +atk_component_ref_accessible_at_point atk_component_remove_focus_handler atk_component_set_extents atk_component_set_position diff --git a/docs/tmpl/atkcomponent.sgml b/docs/tmpl/atkcomponent.sgml index 24134c6..bde93a5 100644 --- a/docs/tmpl/atkcomponent.sgml +++ b/docs/tmpl/atkcomponent.sgml @@ -31,7 +31,7 @@ representation of an object. @parent: @add_focus_handler: @contains: -@get_accessible_at_point: +@ref_accessible_at_point: @get_extents: @get_position: @get_size: @@ -63,18 +63,6 @@ representation of an object. @Returns: - - - - - -@component: -@x: -@y: -@coord_type: -@Returns: - - @@ -118,6 +106,18 @@ representation of an object. @Returns: + + + + + +@component: +@x: +@y: +@coord_type: +@Returns: + + -- 2.7.4