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

diff --git a/ChangeLog b/ChangeLog
index 0d1390ec54ba16ee30de40398b23c8016087bd3e..c26e468c9859df58b9b0e74e361af74c6cef14a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-13  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * 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  <otaylor@redhat.com>
 
        * docs/Makefile.am: Set GPATH to fix srcdir != builddir problems

diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c
index a5cd1beb5ead5cbc55746e72698daa001b307df7..961a68e2e753ec94b86fd508e22cef1603fa7d64 100755 (executable)
--- 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 fb3e49334f2fb792b29c104255d60c3304d014a6..c1b66d0e8b188f6a00d12ee1738b424e05a58664 100755 (executable)
--- 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 ea071136eb636639476805ada49915d147c37886..805bb637d56ef582acbab6ec8db6491dec439b3c 100644 (file)
--- 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 24134c6ab1f22ae5730917e1d999df5b01814ca4..bde93a528e4bc1243b18d5c66f7a72ed10c1e86c 100644 (file)
--- 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: 
 
 
-<!-- ##### FUNCTION atk_component_get_accessible_at_point ##### -->
-<para>
-
-</para>
-
-@component: 
-@x: 
-@y: 
-@coord_type: 
-@Returns: 
-
-
 <!-- ##### FUNCTION atk_component_get_extents ##### -->
 <para>
 
@@ -118,6 +106,18 @@ representation of an object.
 @Returns: 
 
 
+<!-- ##### FUNCTION atk_component_ref_accessible_at_point ##### -->
+<para>
+
+</para>
+
+@component: 
+@x: 
+@y: 
+@coord_type: 
+@Returns: 
+
+
 <!-- ##### FUNCTION atk_component_remove_focus_handler ##### -->
 <para>