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

data/ext/atk/rbatkstreamablecontent.c

@@ -1,47 +1,57 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatkstreamablecontent.c -
-
-  $Author: mutoh $
-  $Date: 2005/09/15 17:30:46 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_STREAMABLE_CONTENT(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 mStreamableContent
+#define _SELF(s) (RVAL2ATKSTREAMABLECONTENT(s))
 
 static VALUE
-rbatkst_get_n_mime_types(VALUE self)
+rg_n_mime_types(VALUE self)
 {
     return INT2NUM(atk_streamable_content_get_n_mime_types(_SELF(self)));
 }
 
 static VALUE
-rbatkst_get_mime_type(VALUE self, VALUE i)
+rg_mime_type(VALUE self, VALUE i)
 {
     return CSTR2RVAL(atk_streamable_content_get_mime_type(_SELF(self), NUM2INT(i)));
 }
 
 static VALUE
-rbatkst_get_stream(VALUE self, VALUE mime_type)
+rg_get_stream(VALUE self, VALUE mime_type)
 {
     GIOChannel* io = atk_streamable_content_get_stream(_SELF(self), RVAL2CSTR(mime_type));
     if (!io)
         rb_raise(rb_eRuntimeError, "Couldn't get the stream.");
 
-    return BOXED2RVAL(io, G_TYPE_IO_CHANNEL);
+    return GIOCHANNEL2RVAL(io);
 }
 
-
 void
-Init_atk_streamable_content()
+Init_atk_streamable_content(VALUE mAtk)
 {
-    VALUE mContent = G_DEF_INTERFACE(ATK_TYPE_STREAMABLE_CONTENT, "StreamableContent", mAtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_STREAMABLE_CONTENT, "StreamableContent", mAtk);
 
-    rb_define_method(mContent, "n_mime_types", rbatkst_get_n_mime_types, 0);
-    rb_define_method(mContent, "mime_type", rbatkst_get_mime_type, 1);
-    rb_define_method(mContent, "get_stream", rbatkst_get_stream, 1);
+    RG_DEF_METHOD(n_mime_types, 0);
+    RG_DEF_METHOD(mime_type, 1);
+    RG_DEF_METHOD(get_stream, 1);
 }

data/ext/atk/rbatktable.c

@@ -1,146 +1,157 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatktable.c -
-
-  $Author: mutoh $
-  $Date: 2004/03/05 15:33:48 $
-
-  Copyright (C) 2003,2004 Masao Mutoh
-************************************************/
-
-#include "rbatk.h"
-
-#define _SELF(s) (ATK_TABLE(RVAL2GOBJ(s)))
+/*
+ *  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 mTable
+#define _SELF(s) (RVAL2ATKTABLE(s))
 
 static VALUE
-rbatk_table_ref_at(VALUE self, VALUE row, VALUE column)
+rg_ref_at(VALUE self, VALUE row, VALUE column)
 {
     return GOBJ2RVAL(atk_table_ref_at(_SELF(self), NUM2INT(row), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_get_index_at(VALUE self, VALUE row, VALUE column)
+rg_get_index_at(VALUE self, VALUE row, VALUE column)
 {
     return INT2NUM(atk_table_get_index_at(_SELF(self), NUM2INT(row), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_get_column_at_index(VALUE self, VALUE index_)
+rg_get_column_at_index(VALUE self, VALUE index_)
 {
     return INT2NUM(atk_table_get_column_at_index(_SELF(self), NUM2INT(index_)));
 }
 
 static VALUE
-rbatk_table_get_row_at_index(VALUE self, VALUE index_)
+rg_get_row_at_index(VALUE self, VALUE index_)
 {
     return INT2NUM(atk_table_get_row_at_index(_SELF(self), NUM2INT(index_)));
 }
 
 static VALUE
-rbatk_table_get_n_columns(VALUE self)
+rg_n_columns(VALUE self)
 {
     return INT2NUM(atk_table_get_n_columns(_SELF(self)));
 }
 
 static VALUE
-rbatk_table_get_n_rows(VALUE self)
+rg_n_rows(VALUE self)
 {
     return INT2NUM(atk_table_get_n_rows(_SELF(self)));
 }
 
 static VALUE
-rbatk_table_get_column_extent_at(VALUE self, VALUE row, VALUE column)
+rg_get_column_extent_at(VALUE self, VALUE row, VALUE column)
 {
     return INT2NUM(atk_table_get_column_extent_at(_SELF(self), NUM2INT(row), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_get_row_extent_at(VALUE self, VALUE row, VALUE column)
+rg_get_row_extent_at(VALUE self, VALUE row, VALUE column)
 {
     return INT2NUM(atk_table_get_row_extent_at(_SELF(self), NUM2INT(row), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_get_caption(VALUE self)
+rg_caption(VALUE self)
 {
     return GOBJ2RVAL(atk_table_get_caption(_SELF(self)));
 }
 
 static VALUE
-rbatk_table_get_column_description(VALUE self, VALUE column)
+rg_get_column_description(VALUE self, VALUE column)
 {
     return CSTR2RVAL(atk_table_get_column_description(_SELF(self), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_get_row_description(VALUE self, VALUE row)
+rg_get_row_description(VALUE self, VALUE row)
 {
     return CSTR2RVAL(atk_table_get_row_description(_SELF(self), NUM2INT(row)));
 }
 
 static VALUE
-rbatk_table_get_column_header(VALUE self, VALUE column)
+rg_get_column_header(VALUE self, VALUE column)
 {
     return GOBJ2RVAL(atk_table_get_column_header(_SELF(self), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_get_row_header(VALUE self, VALUE row)
+rg_get_row_header(VALUE self, VALUE row)
 {
     return GOBJ2RVAL(atk_table_get_row_header(_SELF(self), NUM2INT(row)));
 }
 
 static VALUE
-rbatk_table_get_summary(VALUE self)
+rg_summary(VALUE self)
 {
     return GOBJ2RVAL(atk_table_get_summary(_SELF(self)));
 }
 
 static VALUE
-rbatk_table_set_caption(VALUE self, VALUE caption)
+rg_set_caption(VALUE self, VALUE caption)
 {
-    atk_table_set_caption(_SELF(self), ATK_OBJECT(RVAL2GOBJ(caption)));
+    atk_table_set_caption(_SELF(self), RVAL2ATKOBJECT(caption));
     return self;
 }
 
 static VALUE
-rbatk_table_set_row_description(VALUE self, VALUE row, VALUE description)
+rg_set_row_description(VALUE self, VALUE row, VALUE description)
 {
     atk_table_set_row_description(_SELF(self), NUM2INT(row), RVAL2CSTR(description));
     return self;
 }
 
 static VALUE
-rbatk_table_set_column_description(VALUE self, VALUE column, VALUE description)
+rg_set_column_description(VALUE self, VALUE column, VALUE description)
 {
     atk_table_set_column_description(_SELF(self), NUM2INT(column), RVAL2CSTR(description));
     return self;
 }
 
 static VALUE
-rbatk_table_set_row_header(VALUE self, VALUE row, VALUE header)
+rg_set_row_header(VALUE self, VALUE row, VALUE header)
 {
-    atk_table_set_row_header(_SELF(self), NUM2INT(row), ATK_OBJECT(RVAL2GOBJ(header)));
+    atk_table_set_row_header(_SELF(self), NUM2INT(row), RVAL2ATKOBJECT(header));
     return self;
 }
 
 static VALUE
-rbatk_table_set_column_header(VALUE self, VALUE column, VALUE header)
+rg_set_column_header(VALUE self, VALUE column, VALUE header)
 {
-    atk_table_set_column_header(_SELF(self), NUM2INT(column), ATK_OBJECT(RVAL2GOBJ(header)));
+    atk_table_set_column_header(_SELF(self), NUM2INT(column), RVAL2ATKOBJECT(header));
     return self;
 }
 
 static VALUE
-rbatk_table_set_summary(VALUE self, VALUE accessible)
+rg_set_summary(VALUE self, VALUE accessible)
 {
-    atk_table_set_summary(_SELF(self), ATK_OBJECT(RVAL2GOBJ(accessible)));
+    atk_table_set_summary(_SELF(self), RVAL2ATKOBJECT(accessible));
     return self;
 }
 
 static VALUE
-rbatk_table_get_selected_columns(VALUE self)
+rg_selected_columns(VALUE self)
 {
     gint ret;
     gint* selected;
@@ -157,7 +168,7 @@ rbatk_table_get_selected_columns(VALUE self)
 }
 
 static VALUE
-rbatk_table_get_selected_rows(VALUE self)
+rg_selected_rows(VALUE self)
 {
     gint ret;
     gint* selected;
@@ -174,25 +185,25 @@ rbatk_table_get_selected_rows(VALUE self)
 }
 
 static VALUE
-rbatk_table_is_column_selected(VALUE self, VALUE column)
+rg_column_selected_p(VALUE self, VALUE column)
 {
     return CBOOL2RVAL(atk_table_is_column_selected(_SELF(self), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_is_row_selected(VALUE self, VALUE row)
+rg_row_selected_p(VALUE self, VALUE row)
 {
     return CBOOL2RVAL(atk_table_is_row_selected(_SELF(self), NUM2INT(row)));
 }
 
 static VALUE
-rbatk_table_is_selected(VALUE self, VALUE row, VALUE column)
+rg_selected_p(VALUE self, VALUE row, VALUE column)
 {
     return CBOOL2RVAL(atk_table_is_selected(_SELF(self), NUM2INT(row), NUM2INT(column)));
 }
 
 static VALUE
-rbatk_table_add_column_selection(VALUE self, VALUE column)
+rg_add_column_selection(VALUE self, VALUE column)
 {
     gboolean ret = atk_table_add_column_selection(_SELF(self), NUM2INT(column));
     if (! ret) rb_raise(rb_eRuntimeError, "not implement this interface");
@@ -200,7 +211,7 @@ rbatk_table_add_column_selection(VALUE self, VALUE column)
 }
 
 static VALUE
-rbatk_table_add_row_selection(VALUE self, VALUE row)
+rg_add_row_selection(VALUE self, VALUE row)
 {
     gboolean ret = atk_table_add_row_selection(_SELF(self), NUM2INT(row));
     if (! ret) rb_raise(rb_eRuntimeError, "not implement this interface");
@@ -208,7 +219,7 @@ rbatk_table_add_row_selection(VALUE self, VALUE row)
 }
 
 static VALUE
-rbatk_table_remove_column_selection(VALUE self, VALUE column)
+rg_remove_column_selection(VALUE self, VALUE column)
 {
     gboolean ret = atk_table_remove_column_selection(_SELF(self), NUM2INT(column));
     if (! ret) rb_raise(rb_eRuntimeError, "not implement this interface");
@@ -216,7 +227,7 @@ rbatk_table_remove_column_selection(VALUE self, VALUE column)
 }
 
 static VALUE
-rbatk_table_remove_row_selection(VALUE self, VALUE row)
+rg_remove_row_selection(VALUE self, VALUE row)
 {
     gboolean ret = atk_table_remove_row_selection(_SELF(self), NUM2INT(row));
     if (! ret) rb_raise(rb_eRuntimeError, "not implement this interface");
@@ -224,39 +235,39 @@ rbatk_table_remove_row_selection(VALUE self, VALUE row)
 }
 
 void
-Init_atk_table()
+Init_atk_table(VALUE mAtk)
 {
-    VALUE mTable = G_DEF_INTERFACE(ATK_TYPE_TABLE, "Table", mAtk);
-
-    rb_define_method(mTable, "ref_at", rbatk_table_ref_at, 2);
-    rb_define_method(mTable, "get_index_at", rbatk_table_get_index_at, 2);
-    rb_define_method(mTable, "get_column_at_index", rbatk_table_get_column_at_index, 1);
-    rb_define_method(mTable, "get_row_at_index", rbatk_table_get_row_at_index, 1);
-    rb_define_method(mTable, "n_columns", rbatk_table_get_n_columns, 0);
-    rb_define_method(mTable, "n_rows", rbatk_table_get_n_rows, 0);
-    rb_define_method(mTable, "get_column_extent_at", rbatk_table_get_column_extent_at, 2);
-    rb_define_method(mTable, "get_row_extent_at", rbatk_table_get_row_extent_at, 2);
-    rb_define_method(mTable, "caption", rbatk_table_get_caption, 0);
-    rb_define_method(mTable, "get_column_description", rbatk_table_get_column_description, 1);
-    rb_define_method(mTable, "get_row_description", rbatk_table_get_row_description, 1);
-    rb_define_method(mTable, "get_column_header", rbatk_table_get_column_header, 1);
-    rb_define_method(mTable, "get_row_header", rbatk_table_get_row_header, 1);
-    rb_define_method(mTable, "summary", rbatk_table_get_summary, 0);
-    rb_define_method(mTable, "set_caption", rbatk_table_set_caption, 1);
-    rb_define_method(mTable, "set_row_description", rbatk_table_set_row_description, 2);
-    rb_define_method(mTable, "set_column_description", rbatk_table_set_column_description, 2);
-    rb_define_method(mTable, "set_row_header", rbatk_table_set_row_header, 2);
-    rb_define_method(mTable, "set_column_header", rbatk_table_set_column_header, 2);
-    rb_define_method(mTable, "set_summary", rbatk_table_set_summary, 1);
-    rb_define_method(mTable, "selected_columns", rbatk_table_get_selected_columns, 0);
-    rb_define_method(mTable, "selected_rows", rbatk_table_get_selected_rows, 0);
-    rb_define_method(mTable, "column_selected?", rbatk_table_is_column_selected, 1);
-    rb_define_method(mTable, "row_selected?", rbatk_table_is_row_selected, 1);
-    rb_define_method(mTable, "selected?", rbatk_table_is_selected, 2);
-    rb_define_method(mTable, "add_column_selection", rbatk_table_add_column_selection, 1);
-    rb_define_method(mTable, "add_row_selection", rbatk_table_add_row_selection, 1);
-    rb_define_method(mTable, "remove_column_selection", rbatk_table_remove_column_selection, 1);
-    rb_define_method(mTable, "remove_row_selection", rbatk_table_remove_row_selection, 1);
-
-    G_DEF_SETTERS(mTable);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_TABLE, "Table", mAtk);
+
+    RG_DEF_METHOD(ref_at, 2);
+    RG_DEF_METHOD(get_index_at, 2);
+    RG_DEF_METHOD(get_column_at_index, 1);
+    RG_DEF_METHOD(get_row_at_index, 1);
+    RG_DEF_METHOD(n_columns, 0);
+    RG_DEF_METHOD(n_rows, 0);
+    RG_DEF_METHOD(get_column_extent_at, 2);
+    RG_DEF_METHOD(get_row_extent_at, 2);
+    RG_DEF_METHOD(caption, 0);
+    RG_DEF_METHOD(get_column_description, 1);
+    RG_DEF_METHOD(get_row_description, 1);
+    RG_DEF_METHOD(get_column_header, 1);
+    RG_DEF_METHOD(get_row_header, 1);
+    RG_DEF_METHOD(summary, 0);
+    RG_DEF_METHOD(set_caption, 1);
+    RG_DEF_METHOD(set_row_description, 2);
+    RG_DEF_METHOD(set_column_description, 2);
+    RG_DEF_METHOD(set_row_header, 2);
+    RG_DEF_METHOD(set_column_header, 2);
+    RG_DEF_METHOD(set_summary, 1);
+    RG_DEF_METHOD(selected_columns, 0);
+    RG_DEF_METHOD(selected_rows, 0);
+    RG_DEF_METHOD_P(column_selected, 1);
+    RG_DEF_METHOD_P(row_selected, 1);
+    RG_DEF_METHOD_P(selected, 2);
+    RG_DEF_METHOD(add_column_selection, 1);
+    RG_DEF_METHOD(add_row_selection, 1);
+    RG_DEF_METHOD(remove_column_selection, 1);
+    RG_DEF_METHOD(remove_row_selection, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/atk/rbatktext.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbatktext.c -
-
-  $Author: sakai $
-  $Date: 2006/05/26 14:12:06 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  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
+ */
 
-#include "rbatk.h"
+#include "rbatkprivate.h"
 
-#define _SELF(s) (ATK_TEXT(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE mText
+#define _SELF(s) (RVAL2ATKTEXT(s))
 
 static VALUE
-rbatk_text_get_text(VALUE self, VALUE start_offset, VALUE end_offset)
+rg_get_text(VALUE self, VALUE start_offset, VALUE end_offset)
 {
     VALUE ret;
     gchar* text = atk_text_get_text(_SELF(self), 
@@ -26,7 +37,7 @@ rbatk_text_get_text(VALUE self, VALUE start_offset, VALUE end_offset)
 }
 
 static VALUE
-rbatk_text_get_character_at_offset(VALUE self, VALUE offset)
+rg_get_character_at_offset(VALUE self, VALUE offset)
 {
     gchar buf[10];
     gint len = g_unichar_to_utf8(atk_text_get_character_at_offset
@@ -36,14 +47,14 @@ rbatk_text_get_character_at_offset(VALUE self, VALUE offset)
 }
 
 static VALUE
-rbatk_text_get_text_after_offset(VALUE self, VALUE offset, VALUE boundary_type)
+rg_get_text_after_offset(VALUE self, VALUE offset, VALUE boundary_type)
 {
     gchar* ret;
     VALUE result;
     gint start_offset, end_offset;
 
     ret = atk_text_get_text_after_offset(_SELF(self), NUM2INT(offset),
-                                         RVAL2GENUM(boundary_type, ATK_TYPE_TEXT_BOUNDARY),
+                                         RVAL2ATKTEXTBOUNDARY(boundary_type),
                                          &start_offset, &end_offset);
     result = rb_ary_new3(3, CSTR2RVAL(ret), 
                          INT2NUM(start_offset), INT2NUM(end_offset));
@@ -53,14 +64,14 @@ rbatk_text_get_text_after_offset(VALUE self, VALUE offset, VALUE boundary_type)
 }
 
 static VALUE
-rbatk_text_get_text_at_offset(VALUE self, VALUE offset, VALUE boundary_type)
+rg_get_text_at_offset(VALUE self, VALUE offset, VALUE boundary_type)
 {
     gchar* ret;
     VALUE result;
     gint start_offset, end_offset;
 
     ret = atk_text_get_text_at_offset(_SELF(self), NUM2INT(offset),
-                                      RVAL2GENUM(boundary_type, ATK_TYPE_TEXT_BOUNDARY),
+                                      RVAL2ATKTEXTBOUNDARY(boundary_type),
                                       &start_offset, &end_offset);
     result = rb_ary_new3(3, CSTR2RVAL(ret), 
                          INT2NUM(start_offset), INT2NUM(end_offset));
@@ -70,14 +81,14 @@ rbatk_text_get_text_at_offset(VALUE self, VALUE offset, VALUE boundary_type)
 }
 
 static VALUE
-rbatk_text_get_text_before_offset(VALUE self, VALUE offset, VALUE boundary_type)
+rg_get_text_before_offset(VALUE self, VALUE offset, VALUE boundary_type)
 {
     gchar* ret;
     VALUE result;
     gint start_offset, end_offset;
 
     ret = atk_text_get_text_before_offset(_SELF(self), NUM2INT(offset),
-                                          RVAL2GENUM(boundary_type, ATK_TYPE_TEXT_BOUNDARY),
+                                          RVAL2ATKTEXTBOUNDARY(boundary_type),
                                           &start_offset, &end_offset);
     result = rb_ary_new3(3, CSTR2RVAL(ret), 
                          INT2NUM(start_offset), INT2NUM(end_offset));
@@ -87,23 +98,23 @@ rbatk_text_get_text_before_offset(VALUE self, VALUE offset, VALUE boundary_type)
 }
 
 static VALUE
-rbatk_text_get_caret_offset(VALUE self)
+rg_caret_offset(VALUE self)
 {
     return INT2NUM(atk_text_get_caret_offset(_SELF(self)));
 }
 
 static VALUE
-rbatk_text_get_character_extents(VALUE self, VALUE offset, VALUE coords)
+rg_get_character_extents(VALUE self, VALUE offset, VALUE coords)
 {
     gint x, y, width, height;
     atk_text_get_character_extents(_SELF(self), NUM2INT(offset), 
                                    &x, &y, &width, &height, 
-                                   RVAL2GENUM(coords, ATK_TYPE_COORD_TYPE));
+                                   RVAL2ATKCOORDTYPE(coords));
     return rb_ary_new3(4, INT2NUM(x), INT2NUM(y), INT2NUM(width), INT2NUM(height));
 }
 
 static VALUE
-rbatk_text_get_run_attributes(VALUE self, VALUE offset)
+rg_get_run_attributes(VALUE self, VALUE offset)
 {
     gint start_offset, end_offset;
     AtkAttributeSet* list;
@@ -113,7 +124,7 @@ rbatk_text_get_run_attributes(VALUE self, VALUE offset)
                                        &start_offset, &end_offset);
 
     ary = rb_ary_new();
-  
+
     while (list) {
         AtkAttribute* data = (AtkAttribute*)list->data;
         rb_ary_push(ary, rb_assoc_new(CSTR2RVAL(data->name), 
@@ -125,14 +136,14 @@ rbatk_text_get_run_attributes(VALUE self, VALUE offset)
 }
 
 static VALUE
-rbatk_text_get_default_attributes(VALUE self)
+rg_default_attributes(VALUE self)
 {
     AtkAttributeSet* list;
     VALUE ary;
 
     list = atk_text_get_default_attributes(_SELF(self));
     ary = rb_ary_new();
-  
+
     while (list) {
         AtkAttribute* data = (AtkAttribute*)list->data;
         rb_ary_push(ary, rb_assoc_new(CSTR2RVAL(data->name), 
@@ -144,35 +155,35 @@ rbatk_text_get_default_attributes(VALUE self)
 }
 
 static VALUE
-rbatk_text_get_character_count(VALUE self)
+rg_character_count(VALUE self)
 {
     return INT2NUM(atk_text_get_character_count(_SELF(self)));
 }
 
 static VALUE
-rbatk_text_get_offset_at_point(VALUE self, VALUE x, VALUE y, VALUE coords)
+rg_get_offset_at_point(VALUE self, VALUE x, VALUE y, VALUE coords)
 {
     return INT2NUM(atk_text_get_offset_at_point(_SELF(self), 
                                                 NUM2INT(x), NUM2INT(y),
-                                                RVAL2GENUM(coords, ATK_TYPE_COORD_TYPE)));
+                                                RVAL2ATKCOORDTYPE(coords)));
 }
 
 #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
 #ifdef HAVE_ATK_TEXT_CLIP_TYPE_GET_TYPE
 static VALUE
-rbatk_text_get_bounded_ranges(VALUE self, VALUE rect, VALUE coord_type, VALUE x_clip_type, VALUE y_clip_type)
+rg_get_bounded_ranges(VALUE self, VALUE rect, VALUE coord_type, VALUE x_clip_type, VALUE y_clip_type)
 {
     AtkTextRange** ranges;
     int i = 0;
     VALUE ary;
     ranges = atk_text_get_bounded_ranges(_SELF(self),
-                                         RVAL2BOXED(rect, ATK_TYPE_TEXT_RECTANGLE),
-                                         RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE),
-                                         RVAL2GENUM(x_clip_type, ATK_TYPE_TEXT_CLIP_TYPE),
-                                         RVAL2GENUM(y_clip_type, ATK_TYPE_TEXT_CLIP_TYPE));
+                                         RVAL2ATKTEXTRECTANGLE(rect),
+                                         RVAL2ATKCOORDTYPE(coord_type),
+                                         RVAL2ATKTEXTCLIPTYPE(x_clip_type),
+                                         RVAL2ATKTEXTCLIPTYPE(y_clip_type));
     ary = rb_ary_new();
     while(ranges[i]){
-        rb_ary_push(ary, BOXED2RVAL(ranges[i], ATK_TYPE_TEXT_RANGE));
+        rb_ary_push(ary, ATKTEXTRANGE2RVAL(ranges[i]));
         i++;
     }
 #ifdef HAVE_ATK_TEXT_FREE_RANGES
@@ -183,14 +194,14 @@ rbatk_text_get_bounded_ranges(VALUE self, VALUE rect, VALUE coord_type, VALUE x_
 #endif
 
 static VALUE
-rbatk_text_get_range_extents(VALUE self, VALUE start_offset, VALUE end_offset, VALUE coord_type)
+rg_get_range_extents(VALUE self, VALUE start_offset, VALUE end_offset, VALUE coord_type)
 {
     AtkTextRectangle rect;
     atk_text_get_range_extents(_SELF(self), NUM2INT(start_offset),
                                NUM2INT(end_offset), 
-                               RVAL2GENUM(coord_type, ATK_TYPE_COORD_TYPE),
+                               RVAL2ATKCOORDTYPE(coord_type),
                                &rect);
-    return BOXED2RVAL(&rect, ATK_TYPE_TEXT_RECTANGLE);
+    return ATKTEXTRECTANGLE2RVAL(&rect);
 }
 
 /* Don't need this
@@ -199,13 +210,13 @@ void        atk_text_free_ranges            (AtkTextRange **ranges);
 #endif
 
 static VALUE
-rbatk_text_get_n_selections(VALUE self)
+rg_n_selections(VALUE self)
 {
     return INT2NUM(atk_text_get_n_selections(_SELF(self)));
 }
 
 static VALUE
-rbatk_text_get_selection(VALUE self, VALUE selection_num)
+rg_get_selection(VALUE self, VALUE selection_num)
 {
     gint start_offset, end_offset;
     VALUE ret;
@@ -218,7 +229,7 @@ rbatk_text_get_selection(VALUE self, VALUE selection_num)
 }
 
 static VALUE
-rbatk_text_add_selection(VALUE self, VALUE start_offset, VALUE end_offset)
+rg_add_selection(VALUE self, VALUE start_offset, VALUE end_offset)
 {
     gboolean ret = atk_text_add_selection(_SELF(self), NUM2INT(start_offset),
                                           NUM2INT(end_offset));
@@ -227,7 +238,7 @@ rbatk_text_add_selection(VALUE self, VALUE start_offset, VALUE end_offset)
 }
 
 static VALUE
-rbatk_text_remove_selection(VALUE self, VALUE selection_num)
+rg_remove_selection(VALUE self, VALUE selection_num)
 {
     gint num;
     gboolean ret;
@@ -240,7 +251,7 @@ rbatk_text_remove_selection(VALUE self, VALUE selection_num)
 }
 
 static VALUE
-rbatk_text_set_selection(VALUE self, VALUE selection_num, VALUE start_offset, VALUE end_offset)
+rg_set_selection(VALUE self, VALUE selection_num, VALUE start_offset, VALUE end_offset)
 {
     gboolean ret = atk_text_set_selection(_SELF(self), NUM2INT(selection_num),
                                           NUM2INT(start_offset),
@@ -250,93 +261,60 @@ rbatk_text_set_selection(VALUE self, VALUE selection_num, VALUE start_offset, VA
 }
 
 static VALUE
-rbatk_text_set_caret_offset(VALUE self, VALUE offset)
+rg_set_caret_offset(VALUE self, VALUE offset)
 {
     gboolean ret = atk_text_set_caret_offset(_SELF(self), NUM2INT(offset));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set caret offset");
     return self;
 }
 
-
 /* We don't need them.
     void        atk_attribute_set_free          (AtkAttributeSet *attrib_set);
 */
 
-/*
- * Atk::TextAttribute
- */
-static VALUE
-rbatk_tattr_s_register(VALUE self, VALUE name)
-{
-    return GENUM2RVAL(atk_text_attribute_register(RVAL2CSTR(name)), ATK_TYPE_TEXT_ATTRIBUTE);
-}
-
-/* We don't need this.
-G_CONST_RETURN gchar* atk_textattribute_type_get_name
-                                            (AtkTextattributeType type);
-*/
-
-static VALUE
-rbatk_tattr_s_for_name(VALUE self, VALUE name)
-{
-    return GENUM2RVAL(atk_text_attribute_for_name(RVAL2CSTR(name)), ATK_TYPE_TEXT_ATTRIBUTE);
-}
-
-static VALUE
-rbatk_tattr_get_value(VALUE self, VALUE index)
-{
-    return CSTR2RVAL(atk_text_attribute_get_value(RVAL2GENUM(self, ATK_TYPE_TEXT_ATTRIBUTE), 
-                                                  NUM2INT(index)));
-}
 void
-Init_atk_text()
+Init_atk_text(VALUE mAtk)
 {
-    VALUE tattr;
-    VALUE mText = G_DEF_INTERFACE(ATK_TYPE_TEXT, "Text", mAtk);
-
-    rb_define_method(mText, "get_text", rbatk_text_get_text, 2);
-    rb_define_method(mText, "get_character_at_offset", rbatk_text_get_character_at_offset, 1);
-    rb_define_method(mText, "get_text_after_offset", rbatk_text_get_text_after_offset, 2);
-    rb_define_method(mText, "get_text_at_offset", rbatk_text_get_text_at_offset, 2);
-    rb_define_method(mText, "get_text_before_offset", rbatk_text_get_text_before_offset, 2);
-    rb_define_method(mText, "caret_offset", rbatk_text_get_caret_offset, 0);
-    rb_define_method(mText, "get_character_extents", rbatk_text_get_character_extents, 2);
-    rb_define_method(mText, "get_run_attributes", rbatk_text_get_run_attributes, 1);
-    rb_define_method(mText, "default_attributes", rbatk_text_get_default_attributes, 0);
-    rb_define_method(mText, "character_count", rbatk_text_get_character_count, 0);
-    rb_define_method(mText, "get_offset_at_point", rbatk_text_get_offset_at_point, 3);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(ATK_TYPE_TEXT, "Text", mAtk);
+
+    RG_DEF_METHOD(get_text, 2);
+    RG_DEF_METHOD(get_character_at_offset, 1);
+    RG_DEF_METHOD(get_text_after_offset, 2);
+    RG_DEF_METHOD(get_text_at_offset, 2);
+    RG_DEF_METHOD(get_text_before_offset, 2);
+    RG_DEF_METHOD(caret_offset, 0);
+    RG_DEF_METHOD(get_character_extents, 2);
+    RG_DEF_METHOD(get_run_attributes, 1);
+    RG_DEF_METHOD(default_attributes, 0);
+    RG_DEF_METHOD(character_count, 0);
+    RG_DEF_METHOD(get_offset_at_point, 3);
 #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
 #ifdef HAVE_ATK_TEXT_CLIP_TYPE_GET_TYPE
-    rb_define_method(mText, "get_bounded_ranges", rbatk_text_get_bounded_ranges, 4);
-    rb_define_method(mText, "get_range_extents", rbatk_text_get_range_extents, 3);
+    RG_DEF_METHOD(get_bounded_ranges, 4);
+    RG_DEF_METHOD(get_range_extents, 3);
 #endif
 #endif
-    rb_define_method(mText, "n_selections", rbatk_text_get_n_selections, 0);
-    rb_define_method(mText, "get_selection", rbatk_text_get_selection, 1);
-    rb_define_method(mText, "add_selection", rbatk_text_add_selection, 2);
-    rb_define_method(mText, "remove_selection", rbatk_text_remove_selection, 1);
-    rb_define_method(mText, "set_selection", rbatk_text_set_selection, 3);
-    rb_define_method(mText, "set_caret_offset", rbatk_text_set_caret_offset, 1);
-
-    G_DEF_SETTERS(mText);
-    
+    RG_DEF_METHOD(n_selections, 0);
+    RG_DEF_METHOD(get_selection, 1);
+    RG_DEF_METHOD(add_selection, 2);
+    RG_DEF_METHOD(remove_selection, 1);
+    RG_DEF_METHOD(set_selection, 3);
+    RG_DEF_METHOD(set_caret_offset, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
+
     /* AtkTextBoundary */
 #ifdef ATK_TYPE_TEXT_BOUNDARY
-    G_DEF_CLASS(ATK_TYPE_TEXT_BOUNDARY, "Boundary", mText);
-    G_DEF_CONSTANTS(mText, ATK_TYPE_TEXT_BOUNDARY, "ATK_TEXT_");
+    G_DEF_CLASS(ATK_TYPE_TEXT_BOUNDARY, "Boundary", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, ATK_TYPE_TEXT_BOUNDARY, "ATK_TEXT_");
 #endif    
     /* AtkTextClipType */
 #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
 #ifdef HAVE_ATK_TEXT_CLIP_TYPE_GET_TYPE
-    G_DEF_CLASS(ATK_TYPE_TEXT_CLIP_TYPE, "ClipType", mText);
-    G_DEF_CONSTANTS(mText, ATK_TYPE_TEXT_CLIP_TYPE, "ATK_TEXT_");
+    G_DEF_CLASS(ATK_TYPE_TEXT_CLIP_TYPE, "ClipType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, ATK_TYPE_TEXT_CLIP_TYPE, "ATK_TEXT_");
 #endif
 #endif
 
-    tattr = G_DEF_CLASS(ATK_TYPE_TEXT_ATTRIBUTE, "Attribute", mText);
-    G_DEF_CONSTANTS(mText, ATK_TYPE_TEXT_ATTRIBUTE, "ATK_TEXT_");
-
-    rb_define_singleton_method(tattr, "type_register", rbatk_tattr_s_register, 1);
-    rb_define_singleton_method(tattr, "for_name", rbatk_tattr_s_for_name, 1);
-    rb_define_method(tattr, "get_value", rbatk_tattr_get_value, 1);   
+    Init_atk_text_attribute(RG_TARGET_NAMESPACE);
 }