atk 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/atk/rbatkhyperlink.c

@@ -1,59 +1,71 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003,2004 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  rbatkhyperlink.c -
+#include "rbatkprivate.h"
 
-  $Author: mutoh $
-  $Date: 2004/10/17 23:06:07 $
-
-  Copyright (C) 2003,2004 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_HYPERLINK(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE cHyperlink
+#define _SELF(s) (RVAL2ATKHYPERLINK(s))
 
 static VALUE
-rbatk_hl_get_uri(VALUE self, VALUE i)
+rg_get_uri(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_hyperlink_get_uri(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_hl_get_object(VALUE self, VALUE i)
+rg_get_object(VALUE self, VALUE i)
 {
     return GOBJ2RVAL(atk_hyperlink_get_object(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatk_hl_is_valid(VALUE self)
+rg_valid_p(VALUE self)
 {
     return CBOOL2RVAL(atk_hyperlink_is_valid(_SELF(self)));
 }
 
 #ifdef HAVE_ATK_HYPERLINK_IS_INLINE
 static VALUE
-rbatk_hl_is_inline(VALUE self)
+rg_inline_p(VALUE self)
 {
     return CBOOL2RVAL(atk_hyperlink_is_inline(_SELF(self)));
 }
 #endif
 
 static VALUE
-rbatk_hl_get_n_anchors(VALUE self)
+rg_n_anchors(VALUE self)
 {
     return INT2NUM(atk_hyperlink_get_n_anchors(_SELF(self)));
 }
 
 void
-Init_atk_hyperlink()
+Init_atk_hyperlink(VALUE mAtk)
 {
-    VALUE hl = G_DEF_CLASS(ATK_TYPE_HYPERLINK, "Hyperlink", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_HYPERLINK, "Hyperlink", mAtk);
 
-    rb_define_method(hl, "get_uri", rbatk_hl_get_uri, 1);
-    rb_define_method(hl, "get_object", rbatk_hl_get_object, 1);
-    rb_define_method(hl, "valid?", rbatk_hl_is_valid, 0);
+    RG_DEF_METHOD(get_uri, 1);
+    RG_DEF_METHOD(get_object, 1);
+    RG_DEF_METHOD_P(valid, 0);
 #ifdef HAVE_ATK_HYPERLINK_IS_INLINE
-    rb_define_method(hl, "inline?", rbatk_hl_is_inline, 0);
+    RG_DEF_METHOD_P(inline, 0);
 #endif
-    rb_define_method(hl, "n_anchors", rbatk_hl_get_n_anchors, 0);
+    RG_DEF_METHOD(n_anchors, 0);
 }

data/ext/atk/rbatkhypertext.c

@@ -1,41 +1,53 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkhypertext.c -
-
-  $Author: mutoh $
-  $Date: 2003/12/07 17:18:16 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_HYPERTEXT(RVAL2GOBJ(s)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE mHypertext
+#define _SELF(s) (RVAL2ATKHYPERTEXT(s))
 
 static VALUE
-rbatk_ht_get_link(VALUE self, VALUE link_index)
+rg_get_link(VALUE self, VALUE link_index)
 {
     return GOBJ2RVAL(atk_hypertext_get_link(_SELF(self), NUM2INT(link_index)));
 }
 
 static VALUE
-rbatk_ht_get_n_links(VALUE self)
+rg_n_links(VALUE self)
 {
     return INT2NUM(atk_hypertext_get_n_links(_SELF(self)));
 }
 
 static VALUE
-rbatk_ht_get_link_index(VALUE self, VALUE char_index)
+rg_link_index(VALUE self, VALUE char_index)
 {
     return INT2NUM(atk_hypertext_get_link_index(_SELF(self), NUM2INT(char_index)));
 }
 
 void
-Init_atk_hypertext()
+Init_atk_hypertext(VALUE mAtk)
 {
-    VALUE ht = G_DEF_INTERFACE(ATK_TYPE_HYPERTEXT, "Hypertext", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_HYPERTEXT, "Hypertext", mAtk);
 
-    rb_define_method(ht, "get_link", rbatk_ht_get_link, 1);
-    rb_define_method(ht, "n_links", rbatk_ht_get_n_links, 0);
-    rb_define_method(ht, "link_index", rbatk_ht_get_link_index, 1);
+    RG_DEF_METHOD(get_link, 1);
+    RG_DEF_METHOD(n_links, 0);
+    RG_DEF_METHOD(link_index, 1);
 }

data/ext/atk/rbatkimage.c

@@ -1,34 +1,46 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  rbatkhypertext.c -
+#include "rbatkprivate.h"
 
-  $Author: mutoh $
-  $Date: 2004/03/05 15:33:47 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_IMAGE(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE mImage
+#define _SELF(s) (RVAL2ATKIMAGE(s))
 
 static VALUE
-rbatkimage_get_image_position(VALUE self, VALUE coord_type)
+rg_image_position(VALUE self, VALUE coord_type)
 {
     gint x, y;
     atk_image_get_image_position(_SELF(self), &x, &y, 
-                                 RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE));
+                                 RVAL2ATKCOORDTYPE(coord_type));
     return rb_assoc_new(INT2NUM(x), INT2NUM(y));
 }
 
 static VALUE
-rbatkimage_get_image_description(VALUE self)
+rg_image_description(VALUE self)
 {
     return CSTR2RVAL(atk_image_get_image_description(_SELF(self)));
 }
 
 static VALUE
-rbatkimage_set_image_description(VALUE self, VALUE description)
+rg_set_image_description(VALUE self, VALUE description)
 {
     gboolean ret = atk_image_set_image_description(_SELF(self),
                                                    RVAL2CSTR(description));
@@ -37,7 +49,7 @@ rbatkimage_set_image_description(VALUE self, VALUE description)
 }
 
 static VALUE
-rbatkimage_get_image_size(VALUE self)
+rg_image_size(VALUE self)
 {
     gint width, height;
     atk_image_get_image_size(_SELF(self), &width, &height);
@@ -45,14 +57,14 @@ rbatkimage_get_image_size(VALUE self)
 }
 
 void
-Init_atk_image()
+Init_atk_image(VALUE mAtk)
 {
-    VALUE image = G_DEF_INTERFACE(ATK_TYPE_IMAGE, "Image", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_IMAGE, "Image", mAtk);
 
-    rb_define_method(image, "image_position", rbatkimage_get_image_position, 1);
-    rb_define_method(image, "image_description", rbatkimage_get_image_description, 0);
-    rb_define_method(image, "set_image_description", rbatkimage_set_image_description, 1);
-    rb_define_method(image, "image_size", rbatkimage_get_image_size, 0);
+    RG_DEF_METHOD(image_position, 1);
+    RG_DEF_METHOD(image_description, 0);
+    RG_DEF_METHOD(set_image_description, 1);
+    RG_DEF_METHOD(image_size, 0);
 
-    G_DEF_SETTERS(image);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/atk/rbatkimplementor.c

@@ -1,26 +1,38 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  rbatkimplementor.c -
+#include "rbatkprivate.h"
 
-  $Author: mutoh $
-  $Date: 2003/12/07 17:18:16 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_IMPLEMENTOR(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE mImplementor
+#define _SELF(s) (RVAL2ATKIMPLEMENTOR(s))
 
 static VALUE
-rbatkimpl_ref_accessible(VALUE self)
+rg_ref_accessible(VALUE self)
 {
     return GOBJ2RVAL(atk_implementor_ref_accessible(_SELF(self)));
 }
 
 void
-Init_atk_implementor()
+Init_atk_implementor(VALUE mAtk)
 {
-    VALUE impl = G_DEF_INTERFACE(ATK_TYPE_IMPLEMENTOR, "Implementor", mAtk);
-    rb_define_method(impl, "ref_accessible", rbatkimpl_ref_accessible, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_IMPLEMENTOR, "Implementor", mAtk);
+    RG_DEF_METHOD(ref_accessible, 0);
 }

data/ext/atk/rbatknoopobject.c

@@ -1,29 +1,40 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatknoopobject.c -
-
-  $Author: mutoh $
-  $Date: 2003/12/04 18:06:17 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_NOOPOBJECT(RVAL2GOBJ(s)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE cNoOpObject
+#define _SELF(s) (RVAL2ATKNOOPOBJECT(s))
 
 static VALUE
-rbatk_no_op_object_initialize(VALUE self, VALUE gobj)
+rg_initialize(VALUE self, VALUE gobj)
 {
     G_INITIALIZE(self, atk_no_op_object_new(RVAL2GOBJ(gobj)));
     return Qnil;
 }
 
 void
-Init_atk_noopobject()
+Init_atk_noopobject(VALUE mAtk)
 {
-    VALUE noop = G_DEF_CLASS(ATK_TYPE_NO_OP_OBJECT, "NoOpObject", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_NO_OP_OBJECT, "NoOpObject", mAtk);
 
-    rb_define_method(noop, "initialize", rbatk_no_op_object_initialize, 1);
+    RG_DEF_METHOD(initialize, 1);
 }

data/ext/atk/rbatknoopobjectfactory.c

@@ -1,29 +1,40 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatknoopobjectfactory.c -
-
-  $Author: mutoh $
-  $Date: 2003/12/07 17:18:16 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_NO_OP_OBJECT_FACTORY(RVAL2GOBJ(s)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE cNoOpObjectFactory
+#define _SELF(s) (RVAL2ATKNOOPOBJECTFACTORY(s))
 
 static VALUE
-rbatk_no_op_object_factory_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, atk_no_op_object_factory_new());
     return Qnil;
 }
 
 void
-Init_atk_noopobjectfactory()
+Init_atk_noopobjectfactory(VALUE mAtk)
 {
-    VALUE noop = G_DEF_CLASS(ATK_TYPE_NO_OP_OBJECT_FACTORY, "NoOpObjectFactory", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_NO_OP_OBJECT_FACTORY, "NoOpObjectFactory", mAtk);
 
-    rb_define_method(noop, "initialize", rbatk_no_op_object_factory_initialize, 0);
+    RG_DEF_METHOD(initialize, 0);
 }

data/ext/atk/rbatkobject.c

@@ -1,16 +1,27 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkobject.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:28 $
-
-  Copyright (C) 2003,2004 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003,2004 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbatkprivate.h"
+
+#define RG_TARGET_NAMESPACE cObject
 #define _SELF(s) RVAL2ATKOBJECT(s)
 
 /* How can I implement this? Since 1.10
@@ -26,19 +37,19 @@ AtkObject*  atk_object_get_parent           (AtkObject *accessible);
 */
 
 static VALUE
-rbatkobj_get_n_accessible_children(VALUE self)
+rg_n_accessible_children(VALUE self)
 {
     return INT2NUM(atk_object_get_n_accessible_children(_SELF(self)));
 }
 
 static VALUE
-rbatkobj_ref_accessible_child(VALUE self, VALUE i)
+rg_ref_accessible_child(VALUE self, VALUE i)
 {
     return GOBJ2RVAL(atk_object_ref_accessible_child(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatkobj_ref_releation_set(VALUE self)
+rg_ref_relation_set(VALUE self)
 {
     return GOBJ2RVAL(atk_object_ref_relation_set(_SELF(self)));
 }
@@ -50,13 +61,13 @@ AtkRole     atk_object_get_role             (AtkObject *accessible);
 */
 
 static VALUE
-rbatkobj_ref_state_set(VALUE self)
+rg_ref_state_set(VALUE self)
 {
     return GOBJ2RVAL(atk_object_ref_state_set(_SELF(self)));
 }
 
 static VALUE
-rbatkobj_get_index_in_parent(VALUE self)
+rg_index_in_parent(VALUE self)
 {
     return INT2NUM(atk_object_get_index_in_parent(_SELF(self)));
 }
@@ -81,10 +92,10 @@ void        atk_object_remove_property_change_handler
 */
 
 static VALUE
-rbatkobj_notify_state_change(VALUE self, VALUE state, VALUE value)
+rg_notify_state_change(VALUE self, VALUE state, VALUE value)
 {
     atk_object_notify_state_change(_SELF(self), 
-                                   RVAL2GENUM(state, ATK_TYPE_STATE_TYPE),
+                                   RVAL2ATKSTATETYPE(state),
                                    RVAL2CBOOL(value));
     return self;
 }
@@ -96,73 +107,47 @@ void        atk_object_initialize           (AtkObject *accessible,
 
 #ifdef HAVE_ATK_OBJECT_ADD_RELATIONSHIP
 static VALUE
-rbatkobj_add_relationship(VALUE self, VALUE relationship, VALUE target)
+rg_add_relationship(VALUE self, VALUE relationship, VALUE target)
 {
     return CBOOL2RVAL(atk_object_add_relationship(
                           _SELF(self), 
-                          RVAL2GENUM(relationship, ATK_TYPE_RELATION_TYPE),
+                          RVAL2ATKRELATIONTYPE(relationship),
                           _SELF(target)));
 }
 #endif
 
 #ifdef HAVE_ATK_OBJECT_REMOVE_RELATIONSHIP
 static VALUE
-rbatkobj_remove_relationship(VALUE self, VALUE relationship, VALUE target)
+rg_remove_relationship(VALUE self, VALUE relationship, VALUE target)
 {
     return CBOOL2RVAL(atk_object_remove_relationship(
                           _SELF(self), 
-                          RVAL2GENUM(relationship, ATK_TYPE_RELATION_TYPE),
+                          RVAL2ATKRELATIONTYPE(relationship),
                           _SELF(target)));
 }
 #endif
 
-/* We don't need this.
-G_CONST_RETURN gchar* atk_role_get_name     (AtkRole role);
-*/
-
-static VALUE
-rbatkrole_get_localized_name(VALUE self)
-{
-#ifdef HAVE_ATK_ROLE_GET_LOCALIZED_NAME
-    return CSTR2RVAL(atk_role_get_localized_name(RVAL2GENUM(self, ATK_TYPE_ROLE)));
-#else
-    rb_warning("not supported in this version of ATK.");
-    return Qnil;
-#endif
-}
-
-static VALUE
-rbatkrole_s_for_name(VALUE self, VALUE name)
-{
-    return GENUM2RVAL(atk_role_for_name(RVAL2CSTR(name)), ATK_TYPE_ROLE);
-}
-
 void
-Init_atk_object()
+Init_atk_object(VALUE mAtk)
 {
-    VALUE obj = G_DEF_CLASS(ATK_TYPE_OBJECT, "Object", mAtk);
-    VALUE role;
-
-    rb_define_method(obj, "n_accessible_children", rbatkobj_get_n_accessible_children, 0);
-    rb_define_method(obj, "ref_accessible_child", rbatkobj_ref_accessible_child, 1);
-    rb_define_method(obj, "ref_relation_set", rbatkobj_ref_releation_set, 0);
-    rb_define_method(obj, "ref_state_set", rbatkobj_ref_state_set, 0);
-    rb_define_method(obj, "index_in_parent", rbatkobj_get_index_in_parent, 0);
-    rb_define_method(obj, "notify_state_change", rbatkobj_notify_state_change, 2);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_OBJECT, "Object", mAtk);
+
+    RG_DEF_METHOD(n_accessible_children, 0);
+    RG_DEF_METHOD(ref_accessible_child, 1);
+    RG_DEF_METHOD(ref_relation_set, 0);
+    RG_DEF_METHOD(ref_state_set, 0);
+    RG_DEF_METHOD(index_in_parent, 0);
+    RG_DEF_METHOD(notify_state_change, 2);
 #ifdef HAVE_ATK_OBJECT_ADD_RELATIONSHIP
-    rb_define_method(obj, "add_relationship", rbatkobj_add_relationship, 2);
+    RG_DEF_METHOD(add_relationship, 2);
 #endif
 #ifdef HAVE_ATK_OBJECT_REMOVE_RELATIONSHIP
-    rb_define_method(obj, "remove_relationship", rbatkobj_remove_relationship, 2);
+    RG_DEF_METHOD(remove_relationship, 2);
 #endif
 
-    /* AtkRole */
-    role = G_DEF_CLASS(ATK_TYPE_ROLE, "Role", obj);
-    rb_define_method(role, "localized_name", rbatkrole_get_localized_name, 0);
-    rb_define_singleton_method(role, "for_name", rbatkrole_s_for_name, 1);
-    G_DEF_CONSTANTS(obj, ATK_TYPE_ROLE, "ATK_");
+    Init_atk_object_role(RG_TARGET_NAMESPACE);
 
     /* AtkLayer */
-    G_DEF_CLASS(ATK_TYPE_LAYER, "Layer", obj);
-    G_DEF_CONSTANTS(obj, ATK_TYPE_LAYER, "ATK_");
+    G_DEF_CLASS(ATK_TYPE_LAYER, "Layer", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, ATK_TYPE_LAYER, "ATK_");
 }