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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. data/ext/atk/extconf.rb +3 -0
  2. data/ext/atk/rbatk.c +56 -17
  3. data/ext/atk/rbatk.h +21 -12
  4. data/ext/atk/rbatkaction.c +38 -27
  5. data/ext/atk/rbatkcomponent.c +61 -50
  6. data/ext/atk/rbatkconversions.h +70 -0
  7. data/ext/atk/rbatkdocument.c +38 -27
  8. data/ext/atk/rbatkeditabletext.c +123 -39
  9. data/ext/atk/rbatkgobjectaccessible.c +30 -19
  10. data/ext/atk/rbatkhyperlink.c +34 -22
  11. data/ext/atk/rbatkhypertext.c +32 -20
  12. data/ext/atk/rbatkimage.c +34 -22
  13. data/ext/atk/rbatkimplementor.c +26 -14
  14. data/ext/atk/rbatknoopobject.c +28 -17
  15. data/ext/atk/rbatknoopobjectfactory.c +28 -17
  16. data/ext/atk/rbatkobject.c +48 -63
  17. data/ext/atk/rbatkobjectfactory.c +32 -20
  18. data/ext/atk/rbatkobjectrole.c +50 -0
  19. data/ext/atk/rbatkprivate.h +48 -0
  20. data/ext/atk/rbatkregistry.c +34 -22
  21. data/ext/atk/rbatkrelation.c +68 -43
  22. data/ext/atk/rbatkrelationset.c +44 -32
  23. data/ext/atk/rbatkrelationtype.c +38 -0
  24. data/ext/atk/rbatkselection.c +38 -26
  25. data/ext/atk/rbatkstate.c +32 -20
  26. data/ext/atk/rbatkstateset.c +113 -65
  27. data/ext/atk/rbatkstreamablecontent.c +33 -23
  28. data/ext/atk/rbatktable.c +91 -80
  29. data/ext/atk/rbatktext.c +85 -107
  30. data/ext/atk/rbatktextattribute.c +54 -0
  31. data/ext/atk/rbatktextrange.c +38 -33
  32. data/ext/atk/rbatktextrectangle.c +53 -48
  33. data/ext/atk/rbatkutil.c +44 -35
  34. data/ext/atk/rbatkvalue.c +39 -29
  35. data/lib/1.8/atk.so +0 -0
  36. data/lib/1.9/atk.so +0 -0
  37. data/vendor/local/bin/libatk-1.0-0.dll +0 -0
  38. data/vendor/local/lib/atk-1.0.def +3 -0
  39. data/vendor/local/lib/atk-1.0.lib +0 -0
  40. data/vendor/local/lib/libatk-1.0.dll.a +0 -0
  41. data/vendor/local/manifest/{atk-dev_1.32.0-1_win32.mft → atk-dev_1.32.0-2_win32.mft} +3 -3
  42. data/vendor/local/manifest/{atk_1.32.0-1_win32.mft → atk_1.32.0-2_win32.mft} +1 -1
  43. data/vendor/local/src/dieterv/packaging/atk_1.32.0-2_win32.log +740 -0
  44. data/vendor/local/src/{tml/packaging/atk_1.32.0-1_win32.sh → dieterv/packaging/atk_1.32.0-2_win32.sh} +30 -7
  45. metadata +18 -16
  46. data/ChangeLog +0 -278
  47. data/ext/atk/makeinits.rb +0 -39
  48. data/ext/atk/rbatkinits.c +0 -56
  49. data/vendor/local/src/tml/packaging/atk_1.32.0-1_win32.log +0 -730
@@ -0,0 +1,54 @@
1
+ /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
2
+ /*
3
+ * Copyright (C) 2011 Ruby-GNOME2 Project Team
4
+ * Copyright (C) 2004 Masao Mutoh
5
+ *
6
+ * This library is free software; you can redistribute it and/or
7
+ * modify it under the terms of the GNU Lesser General Public
8
+ * License as published by the Free Software Foundation; either
9
+ * version 2.1 of the License, or (at your option) any later version.
10
+ *
11
+ * This library is distributed in the hope that it will be useful,
12
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14
+ * Lesser General Public License for more details.
15
+ *
16
+ * You should have received a copy of the GNU Lesser General Public
17
+ * License along with this library; if not, write to the Free Software
18
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
+ * MA 02110-1301 USA
20
+ */
21
+
22
+ #include "rbatkprivate.h"
23
+
24
+ #define RG_TARGET_NAMESPACE cAttribute
25
+
26
+ static VALUE
27
+ rg_s_type_register(G_GNUC_UNUSED VALUE self, VALUE name)
28
+ {
29
+ return ATKTEXTATTRIBUTE2RVAL(atk_text_attribute_register(RVAL2CSTR(name)));
30
+ }
31
+
32
+ static VALUE
33
+ rg_s_for_name(G_GNUC_UNUSED VALUE self, VALUE name)
34
+ {
35
+ return ATKTEXTATTRIBUTE2RVAL(atk_text_attribute_for_name(RVAL2CSTR(name)));
36
+ }
37
+
38
+ static VALUE
39
+ rg_get_value(VALUE self, VALUE index)
40
+ {
41
+ return CSTR2RVAL(atk_text_attribute_get_value(RVAL2ATKTEXTATTRIBUTE(self),
42
+ NUM2INT(index)));
43
+ }
44
+
45
+ void
46
+ Init_atk_text_attribute(VALUE mText)
47
+ {
48
+ VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_TEXT_ATTRIBUTE, "Attribute", mText);
49
+ G_DEF_CONSTANTS(mText, ATK_TYPE_TEXT_ATTRIBUTE, "ATK_TEXT_");
50
+
51
+ RG_DEF_SMETHOD(type_register, 1);
52
+ RG_DEF_SMETHOD(for_name, 1);
53
+ RG_DEF_METHOD(get_value, 1);
54
+ }
@@ -1,28 +1,33 @@
1
1
  /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
2
- /************************************************
2
+ /*
3
+ * Copyright (C) 2011 Ruby-GNOME2 Project Team
4
+ * Copyright (C) 2004 Masao Mutoh
5
+ * Copyright (C) 2002,2003 Masao Mutoh
6
+ * Copyright (C) 1998-2000 Yukihiro Matsumoto,
7
+ * Daisuke Kanda,
8
+ * Hiroshi Igarashi
9
+ *
10
+ * This library is free software; you can redistribute it and/or
11
+ * modify it under the terms of the GNU Lesser General Public
12
+ * License as published by the Free Software Foundation; either
13
+ * version 2.1 of the License, or (at your option) any later version.
14
+ *
15
+ * This library is distributed in the hope that it will be useful,
16
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18
+ * Lesser General Public License for more details.
19
+ *
20
+ * You should have received a copy of the GNU Lesser General Public
21
+ * License along with this library; if not, write to the Free Software
22
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
23
+ * MA 02110-1301 USA
24
+ */
3
25
 
4
- rbatktextrange.c -
5
-
6
- $Author: sakai $
7
- $Date: 2007/07/16 03:01:02 $
8
-
9
- Copyright (C) 2004 Masao Mutoh
10
-
11
- This file is derived from rbgdkrange.c.
12
- rbgdkrange.c -
13
- Copyright (C) 2002,2003 Masao Mutoh
14
-
15
- rbgdkrange.c file is derived from rbgdkregion.c.
16
- rbgdkregion.c -
17
- Copyright (C) 1998-2000 Yukihiro Matsumoto,
18
- Daisuke Kanda,
19
- Hiroshi Igarashi
20
- ************************************************/
21
-
22
- #include "rbatk.h"
26
+ #include "rbatkprivate.h"
23
27
 
24
28
  #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
25
- #define _SELF(r) ((AtkTextRange*)RVAL2BOXED(r, ATK_TYPE_TEXT_RANGE))
29
+ #define RG_TARGET_NAMESPACE cTextRange
30
+ #define _SELF(r) (RVAL2ATKTEXTRANGE(r))
26
31
 
27
32
  /**********************************/
28
33
  static AtkTextRange*
@@ -39,7 +44,7 @@ GType
39
44
  atk_text_range_get_type(void)
40
45
  {
41
46
  static GType our_type = 0;
42
-
47
+
43
48
  if (our_type == 0)
44
49
  our_type = g_boxed_type_register_static ("AtkTextRange",
45
50
  (GBoxedCopyFunc)atk_text_range_copy,
@@ -49,39 +54,39 @@ atk_text_range_get_type(void)
49
54
  /**********************************/
50
55
  /* Struct accessors */
51
56
  static VALUE
52
- atktextrange_bounds(VALUE self)
57
+ rg_bounds(VALUE self)
53
58
  {
54
- return BOXED2RVAL(&_SELF(self)->bounds, ATK_TYPE_TEXT_RECTANGLE);
59
+ return ATKTEXTRECTANGLE2RVAL(&_SELF(self)->bounds);
55
60
  }
56
61
 
57
62
  static VALUE
58
- atktextrange_start_offset(VALUE self)
63
+ rg_start_offset(VALUE self)
59
64
  {
60
65
  return INT2NUM(_SELF(self)->start_offset);
61
66
  }
62
67
 
63
68
  static VALUE
64
- atktextrange_end_offset(VALUE self)
69
+ rg_end_offset(VALUE self)
65
70
  {
66
71
  return INT2NUM(_SELF(self)->end_offset);
67
72
  }
68
73
 
69
74
  static VALUE
70
- atktextrange_content(VALUE self)
75
+ rg_content(VALUE self)
71
76
  {
72
77
  return CSTR2RVAL(_SELF(self)->content);
73
78
  }
74
79
  #endif
75
80
 
76
81
  void
77
- Init_atk_text_range()
82
+ Init_atk_text_range(VALUE mAtk)
78
83
  {
79
84
  #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
80
- VALUE range = G_DEF_CLASS(ATK_TYPE_TEXT_RANGE, "TextRange", mAtk);
85
+ VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_TEXT_RANGE, "TextRange", mAtk);
81
86
 
82
- rb_define_method(range, "bounds", atktextrange_bounds, 0);
83
- rb_define_method(range, "start_offset", atktextrange_start_offset, 0);
84
- rb_define_method(range, "end_offset", atktextrange_end_offset, 0);
85
- rb_define_method(range, "content", atktextrange_content, 0);
87
+ RG_DEF_METHOD(bounds, 0);
88
+ RG_DEF_METHOD(start_offset, 0);
89
+ RG_DEF_METHOD(end_offset, 0);
90
+ RG_DEF_METHOD(content, 0);
86
91
  #endif
87
92
  }
@@ -1,28 +1,33 @@
1
1
  /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
2
- /************************************************
3
-
4
- rbatktextrectangle.c -
5
-
6
- $Author: mutoh $
7
- $Date: 2004/10/19 13:33:43 $
8
-
9
- Copyright (C) 2004 Masao Mutoh
10
-
11
- This file is derived from rbgdkrectangle.c.
12
- rbgdkrectangle.c -
13
- Copyright (C) 2002,2003 Masao Mutoh
14
-
15
- rbgdkrectangle.c file is derived from rbgdkregion.c.
16
- rbgdkregion.c -
17
- Copyright (C) 1998-2000 Yukihiro Matsumoto,
18
- Daisuke Kanda,
19
- Hiroshi Igarashi
20
- ************************************************/
21
-
22
- #include "rbatk.h"
2
+ /*
3
+ * Copyright (C) 2011 Ruby-GNOME2 Project Team
4
+ * Copyright (C) 2004 Masao Mutoh
5
+ * Copyright (C) 2002,2003 Masao Mutoh
6
+ * Copyright (C) 1998-2000 Yukihiro Matsumoto,
7
+ * Daisuke Kanda,
8
+ * Hiroshi Igarashi
9
+ *
10
+ * This library is free software; you can redistribute it and/or
11
+ * modify it under the terms of the GNU Lesser General Public
12
+ * License as published by the Free Software Foundation; either
13
+ * version 2.1 of the License, or (at your option) any later version.
14
+ *
15
+ * This library is distributed in the hope that it will be useful,
16
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18
+ * Lesser General Public License for more details.
19
+ *
20
+ * You should have received a copy of the GNU Lesser General Public
21
+ * License along with this library; if not, write to the Free Software
22
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
23
+ * MA 02110-1301 USA
24
+ */
25
+
26
+ #include "rbatkprivate.h"
23
27
 
24
28
  #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
25
- #define _SELF(r) ((AtkTextRectangle*)RVAL2BOXED(r, ATK_TYPE_TEXT_RECTANGLE))
29
+ #define RG_TARGET_NAMESPACE cTextRectangle
30
+ #define _SELF(r) (RVAL2ATKTEXTRECTANGLE(r))
26
31
 
27
32
  /**********************************/
28
33
  static AtkTextRectangle*
@@ -39,7 +44,7 @@ GType
39
44
  atk_text_rectangle_get_type(void)
40
45
  {
41
46
  static GType our_type = 0;
42
-
47
+
43
48
  if (our_type == 0)
44
49
  our_type = g_boxed_type_register_static ("AtkTextRectangle",
45
50
  (GBoxedCopyFunc)atk_text_rectangle_copy,
@@ -49,7 +54,7 @@ atk_text_rectangle_get_type(void)
49
54
  /**********************************/
50
55
 
51
56
  static VALUE
52
- atktextrect_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
57
+ rg_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
53
58
  {
54
59
  AtkTextRectangle new;
55
60
 
@@ -64,59 +69,59 @@ atktextrect_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
64
69
 
65
70
  /* Struct accessors */
66
71
  static VALUE
67
- atktextrect_x(VALUE self)
72
+ rg_x(VALUE self)
68
73
  {
69
74
  return INT2NUM(_SELF(self)->x);
70
75
  }
71
76
 
72
77
  static VALUE
73
- atktextrect_y(VALUE self)
78
+ rg_y(VALUE self)
74
79
  {
75
80
  return INT2NUM(_SELF(self)->y);
76
81
  }
77
82
 
78
83
  static VALUE
79
- atktextrect_w(VALUE self)
84
+ rg_width(VALUE self)
80
85
  {
81
86
  return INT2NUM(_SELF(self)->width);
82
87
  }
83
88
 
84
89
  static VALUE
85
- atktextrect_h(VALUE self)
90
+ rg_height(VALUE self)
86
91
  {
87
92
  return INT2NUM(_SELF(self)->height);
88
93
  }
89
94
 
90
95
  static VALUE
91
- atktextrect_set_x(VALUE self, VALUE x)
96
+ rg_set_x(VALUE self, VALUE x)
92
97
  {
93
98
  _SELF(self)->x = NUM2INT(x);
94
99
  return self;
95
100
  }
96
101
 
97
102
  static VALUE
98
- atktextrect_set_y(VALUE self, VALUE y)
103
+ rg_set_y(VALUE self, VALUE y)
99
104
  {
100
105
  _SELF(self)->y = NUM2INT(y);
101
106
  return self;
102
107
  }
103
108
 
104
109
  static VALUE
105
- atktextrect_set_w(VALUE self, VALUE width)
110
+ rg_set_width(VALUE self, VALUE width)
106
111
  {
107
112
  _SELF(self)->width = NUM2INT(width);
108
113
  return self;
109
114
  }
110
115
 
111
116
  static VALUE
112
- atktextrect_set_h(VALUE self, VALUE height)
117
+ rg_set_height(VALUE self, VALUE height)
113
118
  {
114
119
  _SELF(self)->height = NUM2INT(height);
115
120
  return self;
116
121
  }
117
122
 
118
123
  static VALUE
119
- atktextrect_to_a(VALUE self)
124
+ rg_to_a(VALUE self)
120
125
  {
121
126
  AtkTextRectangle* a = _SELF(self);
122
127
  return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),
@@ -125,22 +130,22 @@ atktextrect_to_a(VALUE self)
125
130
  #endif
126
131
 
127
132
  void
128
- Init_atk_text_rectangle()
133
+ Init_atk_text_rectangle(VALUE mAtk)
129
134
  {
130
135
  #ifdef HAVE_ATK_TEXT_GET_BOUNDED_RANGES
131
- VALUE rect = G_DEF_CLASS(ATK_TYPE_TEXT_RECTANGLE, "TextRectangle", mAtk);
132
-
133
- rb_define_method(rect, "initialize", atktextrect_initialize, 4);
134
- rb_define_method(rect, "x", atktextrect_x, 0);
135
- rb_define_method(rect, "y", atktextrect_y, 0);
136
- rb_define_method(rect, "width", atktextrect_w, 0);
137
- rb_define_method(rect, "height", atktextrect_h, 0);
138
- rb_define_method(rect, "set_x", atktextrect_set_x, 1);
139
- rb_define_method(rect, "set_y", atktextrect_set_y, 1);
140
- rb_define_method(rect, "set_width", atktextrect_set_w, 1);
141
- rb_define_method(rect, "set_height", atktextrect_set_h, 1);
142
- rb_define_method(rect, "to_a", atktextrect_to_a, 0);
143
-
144
- G_DEF_SETTERS(rect);
136
+ VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_TEXT_RECTANGLE, "TextRectangle", mAtk);
137
+
138
+ RG_DEF_METHOD(initialize, 4);
139
+ RG_DEF_METHOD(x, 0);
140
+ RG_DEF_METHOD(y, 0);
141
+ RG_DEF_METHOD(width, 0);
142
+ RG_DEF_METHOD(height, 0);
143
+ RG_DEF_METHOD(set_x, 1);
144
+ RG_DEF_METHOD(set_y, 1);
145
+ RG_DEF_METHOD(set_width, 1);
146
+ RG_DEF_METHOD(set_height, 1);
147
+ RG_DEF_METHOD(to_a, 0);
148
+
149
+ G_DEF_SETTERS(RG_TARGET_NAMESPACE);
145
150
  #endif
146
151
  }
data/ext/atk/rbatkutil.c CHANGED
@@ -1,16 +1,27 @@
1
1
  /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
2
- /************************************************
3
-
4
- rbatkutil.c -
5
-
6
- $Author: sakai $
7
- $Date: 2007/07/08 02:51:52 $
8
-
9
- Copyright (C) 2004 Masao Mutoh
10
- ************************************************/
11
-
12
- #include "rbatk.h"
13
-
2
+ /*
3
+ * Copyright (C) 2011 Ruby-GNOME2 Project Team
4
+ * Copyright (C) 2004 Masao Mutoh
5
+ *
6
+ * This library is free software; you can redistribute it and/or
7
+ * modify it under the terms of the GNU Lesser General Public
8
+ * License as published by the Free Software Foundation; either
9
+ * version 2.1 of the License, or (at your option) any later version.
10
+ *
11
+ * This library is distributed in the hope that it will be useful,
12
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14
+ * Lesser General Public License for more details.
15
+ *
16
+ * You should have received a copy of the GNU Lesser General Public
17
+ * License along with this library; if not, write to the Free Software
18
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
+ * MA 02110-1301 USA
20
+ */
21
+
22
+ #include "rbatkprivate.h"
23
+
24
+ #define RG_TARGET_NAMESPACE cUtil
14
25
  static ID id_call;
15
26
 
16
27
  /* How can I implement them?
@@ -26,9 +37,9 @@ void atk_remove_global_event_listener
26
37
  */
27
38
 
28
39
  static VALUE
29
- rbatk_focus_tracker_notify(VALUE self, VALUE obj)
40
+ rg_s_focus_tracker_notify(VALUE self, VALUE obj)
30
41
  {
31
- atk_focus_tracker_notify(ATK_OBJECT(RVAL2GOBJ(obj)));
42
+ atk_focus_tracker_notify(RVAL2ATKOBJECT(obj));
32
43
  return self;
33
44
  }
34
45
 
@@ -44,7 +55,7 @@ key_snoop_func(AtkKeyEventStruct* event, gpointer func)
44
55
  }
45
56
 
46
57
  static VALUE
47
- rbatk_add_key_event_listener(VALUE self)
58
+ rg_s_add_key_event_listener(VALUE self)
48
59
  {
49
60
  guint ret;
50
61
  VALUE func = rb_block_proc();
@@ -54,64 +65,62 @@ rbatk_add_key_event_listener(VALUE self)
54
65
  }
55
66
 
56
67
  static VALUE
57
- rbatk_remove_key_event_listener(VALUE self, VALUE id)
68
+ rg_s_remove_key_event_listener(VALUE self, VALUE id)
58
69
  {
59
70
  atk_remove_key_event_listener(NUM2UINT(id));
60
71
  return self;
61
72
  }
62
73
 
63
74
  static VALUE
64
- rbatk_get_root(VALUE self)
75
+ rg_s_root(G_GNUC_UNUSED VALUE self)
65
76
  {
66
77
  return GOBJ2RVAL(atk_get_root());
67
78
  }
68
79
 
69
80
  #if ATK_CHECK_VERSION(1,6,0)
70
81
  static VALUE
71
- rbatk_get_focus_object(VALUE self)
82
+ rg_s_focus_object(G_GNUC_UNUSED VALUE self)
72
83
  {
73
84
  return GOBJ2RVAL(atk_get_focus_object());
74
85
  }
75
86
  #endif
76
87
 
77
88
  static VALUE
78
- rbatk_get_toolkit_name(VALUE self)
89
+ rg_s_toolkit_name(G_GNUC_UNUSED VALUE self)
79
90
  {
80
91
  return CSTR2RVAL(atk_get_toolkit_name());
81
92
  }
82
93
 
83
94
  static VALUE
84
- rbatk_get_toolkit_version(VALUE self)
95
+ rg_s_toolkit_version(G_GNUC_UNUSED VALUE self)
85
96
  {
86
97
  return CSTR2RVAL(atk_get_toolkit_version());
87
98
  }
88
99
 
89
100
  void
90
- Init_atk_util()
101
+ Init_atk_util(VALUE mAtk)
91
102
  {
92
- VALUE coord;
93
-
94
- VALUE util = G_DEF_CLASS(ATK_TYPE_UTIL, "Util", mAtk);
103
+ VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(ATK_TYPE_UTIL, "Util", mAtk);
95
104
 
96
105
  id_call = rb_intern("call");
97
106
 
98
- rb_define_singleton_method(util, "focus_tracker_notify", rbatk_focus_tracker_notify, 1);
99
- rb_define_singleton_method(util, "add_key_event_listener", rbatk_add_key_event_listener, 0);
100
- rb_define_singleton_method(util, "remove_key_event_listener", rbatk_remove_key_event_listener, 1);
107
+ RG_DEF_SMETHOD(focus_tracker_notify, 1);
108
+ RG_DEF_SMETHOD(add_key_event_listener, 0);
109
+ RG_DEF_SMETHOD(remove_key_event_listener, 1);
101
110
 
102
- rb_define_singleton_method(util, "root", rbatk_get_root, 0);
111
+ RG_DEF_SMETHOD(root, 0);
103
112
  #if ATK_CHECK_VERSION(1,6,0)
104
- rb_define_singleton_method(util, "focus_object", rbatk_get_focus_object, 0);
113
+ RG_DEF_SMETHOD(focus_object, 0);
105
114
  #endif
106
- rb_define_singleton_method(util, "toolkit_name", rbatk_get_toolkit_name, 0);
107
- rb_define_singleton_method(util, "toolkit_version", rbatk_get_toolkit_version, 0);
115
+ RG_DEF_SMETHOD(toolkit_name, 0);
116
+ RG_DEF_SMETHOD(toolkit_version, 0);
108
117
 
109
118
  /* AtkCoordType */
110
- coord = G_DEF_CLASS(ATK_TYPE_COORD_TYPE, "CoordType", util);
111
- G_DEF_CONSTANTS(util, ATK_TYPE_COORD_TYPE, "ATK_");
119
+ G_DEF_CLASS(ATK_TYPE_COORD_TYPE, "CoordType", RG_TARGET_NAMESPACE);
120
+ G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, ATK_TYPE_COORD_TYPE, "ATK_");
112
121
 
113
122
  /* AtkKeyEventType */
114
- coord = G_DEF_CLASS(ATK_TYPE_KEY_EVENT_TYPE, "KeyEventType", util);
115
- G_DEF_CONSTANTS(util, ATK_TYPE_KEY_EVENT_TYPE, "ATK_");
123
+ G_DEF_CLASS(ATK_TYPE_KEY_EVENT_TYPE, "KeyEventType", RG_TARGET_NAMESPACE);
124
+ G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, ATK_TYPE_KEY_EVENT_TYPE, "ATK_");
116
125
 
117
126
  }