atk 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- data/ChangeLog +13 -0
- data/ext/atk/extconf.rb +0 -2
- data/ext/atk/rbatkaction.c +7 -14
- data/ext/atk/rbatkcomponent.c +15 -31
- data/ext/atk/rbatkdocument.c +6 -12
- data/ext/atk/rbatkeditabletext.c +7 -14
- data/ext/atk/rbatkgobjectaccessible.c +2 -4
- data/ext/atk/rbatkhyperlink.c +8 -16
- data/ext/atk/rbatkhypertext.c +3 -6
- data/ext/atk/rbatkimage.c +4 -8
- data/ext/atk/rbatkimplementor.c +1 -2
- data/ext/atk/rbatknoopobject.c +1 -2
- data/ext/atk/rbatknoopobjectfactory.c +1 -2
- data/ext/atk/rbatkobject.c +10 -20
- data/ext/atk/rbatkobjectfactory.c +3 -6
- data/ext/atk/rbatkregistry.c +4 -8
- data/ext/atk/rbatkrelation.c +6 -12
- data/ext/atk/rbatkrelationset.c +7 -14
- data/ext/atk/rbatkselection.c +7 -14
- data/ext/atk/rbatkstate.c +2 -4
- data/ext/atk/rbatkstateset.c +11 -22
- data/ext/atk/rbatkstreamablecontent.c +3 -6
- data/ext/atk/rbatktable.c +29 -58
- data/ext/atk/rbatktext.c +22 -44
- data/ext/atk/rbatktextrange.c +4 -8
- data/ext/atk/rbatktextrectangle.c +10 -20
- data/ext/atk/rbatkutil.c +7 -14
- data/ext/atk/rbatkvalue.c +4 -8
- data/lib/1.8/atk.so +0 -0
- data/lib/1.9/atk.so +0 -0
- metadata +7 -7
data/ext/atk/rbatkimage.c
CHANGED
@@ -13,8 +13,7 @@
|
|
13
13
|
#define _SELF(s) (ATK_IMAGE(RVAL2GOBJ(s)))
|
14
14
|
|
15
15
|
static VALUE
|
16
|
-
rbatkimage_get_image_position(self, coord_type)
|
17
|
-
VALUE self, coord_type;
|
16
|
+
rbatkimage_get_image_position(VALUE self, VALUE coord_type)
|
18
17
|
{
|
19
18
|
gint x, y;
|
20
19
|
atk_image_get_image_position(_SELF(self), &x, &y,
|
@@ -23,15 +22,13 @@ rbatkimage_get_image_position(self, coord_type)
|
|
23
22
|
}
|
24
23
|
|
25
24
|
static VALUE
|
26
|
-
rbatkimage_get_image_description(self)
|
27
|
-
VALUE self;
|
25
|
+
rbatkimage_get_image_description(VALUE self)
|
28
26
|
{
|
29
27
|
return CSTR2RVAL(atk_image_get_image_description(_SELF(self)));
|
30
28
|
}
|
31
29
|
|
32
30
|
static VALUE
|
33
|
-
rbatkimage_set_image_description(self, description)
|
34
|
-
VALUE self, description;
|
31
|
+
rbatkimage_set_image_description(VALUE self, VALUE description)
|
35
32
|
{
|
36
33
|
gboolean ret = atk_image_set_image_description(_SELF(self),
|
37
34
|
RVAL2CSTR(description));
|
@@ -40,8 +37,7 @@ rbatkimage_set_image_description(self, description)
|
|
40
37
|
}
|
41
38
|
|
42
39
|
static VALUE
|
43
|
-
rbatkimage_get_image_size(self)
|
44
|
-
VALUE self;
|
40
|
+
rbatkimage_get_image_size(VALUE self)
|
45
41
|
{
|
46
42
|
gint width, height;
|
47
43
|
atk_image_get_image_size(_SELF(self), &width, &height);
|
data/ext/atk/rbatkimplementor.c
CHANGED
data/ext/atk/rbatknoopobject.c
CHANGED
@@ -14,8 +14,7 @@
|
|
14
14
|
#define _SELF(s) (ATK_NOOPOBJECT(RVAL2GOBJ(s)))
|
15
15
|
|
16
16
|
static VALUE
|
17
|
-
rbatk_no_op_object_initialize(self, gobj)
|
18
|
-
VALUE self, gobj;
|
17
|
+
rbatk_no_op_object_initialize(VALUE self, VALUE gobj)
|
19
18
|
{
|
20
19
|
G_INITIALIZE(self, atk_no_op_object_new(RVAL2GOBJ(gobj)));
|
21
20
|
return Qnil;
|
@@ -14,8 +14,7 @@
|
|
14
14
|
#define _SELF(s) (ATK_NO_OP_OBJECT_FACTORY(RVAL2GOBJ(s)))
|
15
15
|
|
16
16
|
static VALUE
|
17
|
-
rbatk_no_op_object_factory_initialize(self)
|
18
|
-
VALUE self;
|
17
|
+
rbatk_no_op_object_factory_initialize(VALUE self)
|
19
18
|
{
|
20
19
|
G_INITIALIZE(self, atk_no_op_object_factory_new());
|
21
20
|
return Qnil;
|
data/ext/atk/rbatkobject.c
CHANGED
@@ -26,22 +26,19 @@ AtkObject* atk_object_get_parent (AtkObject *accessible);
|
|
26
26
|
*/
|
27
27
|
|
28
28
|
static VALUE
|
29
|
-
rbatkobj_get_n_accessible_children(self)
|
30
|
-
VALUE self;
|
29
|
+
rbatkobj_get_n_accessible_children(VALUE self)
|
31
30
|
{
|
32
31
|
return INT2NUM(atk_object_get_n_accessible_children(_SELF(self)));
|
33
32
|
}
|
34
33
|
|
35
34
|
static VALUE
|
36
|
-
rbatkobj_ref_accessible_child(self, i)
|
37
|
-
VALUE self, i;
|
35
|
+
rbatkobj_ref_accessible_child(VALUE self, VALUE i)
|
38
36
|
{
|
39
37
|
return GOBJ2RVAL(atk_object_ref_accessible_child(_SELF(self), NUM2INT(i)));
|
40
38
|
}
|
41
39
|
|
42
40
|
static VALUE
|
43
|
-
rbatkobj_ref_releation_set(self)
|
44
|
-
VALUE self;
|
41
|
+
rbatkobj_ref_releation_set(VALUE self)
|
45
42
|
{
|
46
43
|
return GOBJ2RVAL(atk_object_ref_relation_set(_SELF(self)));
|
47
44
|
}
|
@@ -53,15 +50,13 @@ AtkRole atk_object_get_role (AtkObject *accessible);
|
|
53
50
|
*/
|
54
51
|
|
55
52
|
static VALUE
|
56
|
-
rbatkobj_ref_state_set(self)
|
57
|
-
VALUE self;
|
53
|
+
rbatkobj_ref_state_set(VALUE self)
|
58
54
|
{
|
59
55
|
return GOBJ2RVAL(atk_object_ref_state_set(_SELF(self)));
|
60
56
|
}
|
61
57
|
|
62
58
|
static VALUE
|
63
|
-
rbatkobj_get_index_in_parent(self)
|
64
|
-
VALUE self;
|
59
|
+
rbatkobj_get_index_in_parent(VALUE self)
|
65
60
|
{
|
66
61
|
return INT2NUM(atk_object_get_index_in_parent(_SELF(self)));
|
67
62
|
}
|
@@ -86,8 +81,7 @@ void atk_object_remove_property_change_handler
|
|
86
81
|
*/
|
87
82
|
|
88
83
|
static VALUE
|
89
|
-
rbatkobj_notify_state_change(self, state, value)
|
90
|
-
VALUE self, state, value;
|
84
|
+
rbatkobj_notify_state_change(VALUE self, VALUE state, VALUE value)
|
91
85
|
{
|
92
86
|
atk_object_notify_state_change(_SELF(self),
|
93
87
|
RVAL2GENUM(state, ATK_TYPE_STATE_TYPE),
|
@@ -102,8 +96,7 @@ void atk_object_initialize (AtkObject *accessible,
|
|
102
96
|
|
103
97
|
#ifdef HAVE_ATK_OBJECT_ADD_RELATIONSHIP
|
104
98
|
static VALUE
|
105
|
-
rbatkobj_add_relationship(self, relationship, target)
|
106
|
-
VALUE self, relationship, target;
|
99
|
+
rbatkobj_add_relationship(VALUE self, VALUE relationship, VALUE target)
|
107
100
|
{
|
108
101
|
return CBOOL2RVAL(atk_object_add_relationship(
|
109
102
|
_SELF(self),
|
@@ -114,8 +107,7 @@ rbatkobj_add_relationship(self, relationship, target)
|
|
114
107
|
|
115
108
|
#ifdef HAVE_ATK_OBJECT_REMOVE_RELATIONSHIP
|
116
109
|
static VALUE
|
117
|
-
rbatkobj_remove_relationship(self, relationship, target)
|
118
|
-
VALUE self, relationship, target;
|
110
|
+
rbatkobj_remove_relationship(VALUE self, VALUE relationship, VALUE target)
|
119
111
|
{
|
120
112
|
return CBOOL2RVAL(atk_object_remove_relationship(
|
121
113
|
_SELF(self),
|
@@ -129,8 +121,7 @@ G_CONST_RETURN gchar* atk_role_get_name (AtkRole role);
|
|
129
121
|
*/
|
130
122
|
|
131
123
|
static VALUE
|
132
|
-
rbatkrole_get_localized_name(self)
|
133
|
-
VALUE self;
|
124
|
+
rbatkrole_get_localized_name(VALUE self)
|
134
125
|
{
|
135
126
|
#ifdef HAVE_ATK_ROLE_GET_LOCALIZED_NAME
|
136
127
|
return CSTR2RVAL(atk_role_get_localized_name(RVAL2GENUM(self, ATK_TYPE_ROLE)));
|
@@ -141,8 +132,7 @@ rbatkrole_get_localized_name(self)
|
|
141
132
|
}
|
142
133
|
|
143
134
|
static VALUE
|
144
|
-
rbatkrole_s_for_name(self, name)
|
145
|
-
VALUE self, name;
|
135
|
+
rbatkrole_s_for_name(VALUE self, VALUE name)
|
146
136
|
{
|
147
137
|
return GENUM2RVAL(atk_role_for_name(RVAL2CSTR(name)), ATK_TYPE_ROLE);
|
148
138
|
}
|
@@ -13,22 +13,19 @@
|
|
13
13
|
#define _SELF(s) (ATK_OBJECT_FACTORY(RVAL2GOBJ(s)))
|
14
14
|
|
15
15
|
static VALUE
|
16
|
-
rbatkfact_create_accessible(self, obj)
|
17
|
-
VALUE self, obj;
|
16
|
+
rbatkfact_create_accessible(VALUE self, VALUE obj)
|
18
17
|
{
|
19
18
|
return GOBJ2RVAL(atk_object_factory_create_accessible(_SELF(self), RVAL2GOBJ(obj)));
|
20
19
|
}
|
21
20
|
|
22
21
|
static VALUE
|
23
|
-
rbatkfact_get_accessible_type(self)
|
24
|
-
VALUE self;
|
22
|
+
rbatkfact_get_accessible_type(VALUE self)
|
25
23
|
{
|
26
24
|
return GTYPE2CLASS(atk_object_factory_get_accessible_type(_SELF(self)));
|
27
25
|
}
|
28
26
|
|
29
27
|
static VALUE
|
30
|
-
rbatkfact_invalidate(self)
|
31
|
-
VALUE self;
|
28
|
+
rbatkfact_invalidate(VALUE self)
|
32
29
|
{
|
33
30
|
atk_object_factory_invalidate(_SELF(self));
|
34
31
|
return self;
|
data/ext/atk/rbatkregistry.c
CHANGED
@@ -13,8 +13,7 @@
|
|
13
13
|
#define _SELF(s) (ATK_REGISTRY(RVAL2GOBJ(s)))
|
14
14
|
|
15
15
|
static VALUE
|
16
|
-
rbatkregistry_set_factory_type(self, type, factory_type)
|
17
|
-
VALUE self, type, factory_type;
|
16
|
+
rbatkregistry_set_factory_type(VALUE self, VALUE type, VALUE factory_type)
|
18
17
|
{
|
19
18
|
atk_registry_set_factory_type(_SELF(self),
|
20
19
|
CLASS2GTYPE(type),
|
@@ -23,23 +22,20 @@ rbatkregistry_set_factory_type(self, type, factory_type)
|
|
23
22
|
}
|
24
23
|
|
25
24
|
static VALUE
|
26
|
-
rbatkregistry_get_factory_type(self, type)
|
27
|
-
VALUE self, type;
|
25
|
+
rbatkregistry_get_factory_type(VALUE self, VALUE type)
|
28
26
|
{
|
29
27
|
return GTYPE2CLASS(atk_registry_get_factory_type(_SELF(self), CLASS2GTYPE(type)));
|
30
28
|
}
|
31
29
|
|
32
30
|
static VALUE
|
33
|
-
rbatkregistry_get_factory(self, type)
|
34
|
-
VALUE self, type;
|
31
|
+
rbatkregistry_get_factory(VALUE self, VALUE type)
|
35
32
|
{
|
36
33
|
return GOBJ2RVAL(atk_registry_get_factory(_SELF(self),
|
37
34
|
CLASS2GTYPE(type)));
|
38
35
|
}
|
39
36
|
|
40
37
|
static VALUE
|
41
|
-
rbatkregistry_s_get_default_registry(self)
|
42
|
-
VALUE self;
|
38
|
+
rbatkregistry_s_get_default_registry(VALUE self)
|
43
39
|
{
|
44
40
|
return GOBJ2RVAL(atk_get_default_registry());
|
45
41
|
}
|
data/ext/atk/rbatkrelation.c
CHANGED
@@ -13,8 +13,7 @@
|
|
13
13
|
#define _SELF(s) (ATK_RELATION(RVAL2GOBJ(s)))
|
14
14
|
|
15
15
|
static VALUE
|
16
|
-
rbatkrel_s_type_register(self, name)
|
17
|
-
VALUE self, name;
|
16
|
+
rbatkrel_s_type_register(VALUE self, VALUE name)
|
18
17
|
{
|
19
18
|
return GENUM2RVAL(atk_relation_type_register(RVAL2CSTR(name)), ATK_TYPE_RELATION_TYPE);
|
20
19
|
}
|
@@ -25,16 +24,14 @@ G_CONST_RETURN gchar* atk_relation_type_get_name
|
|
25
24
|
*/
|
26
25
|
|
27
26
|
static VALUE
|
28
|
-
rbatkrelation_s_for_name(self, name)
|
29
|
-
VALUE self, name;
|
27
|
+
rbatkrelation_s_for_name(VALUE self, VALUE name)
|
30
28
|
{
|
31
29
|
return GENUM2RVAL(atk_relation_type_for_name(RVAL2CSTR(name)), ATK_TYPE_RELATION_TYPE);
|
32
30
|
}
|
33
31
|
|
34
32
|
|
35
33
|
static VALUE
|
36
|
-
rbatkrel_initialize(self, targets, relationship)
|
37
|
-
VALUE self, targets, relationship;
|
34
|
+
rbatkrel_initialize(VALUE self, VALUE targets, VALUE relationship)
|
38
35
|
{
|
39
36
|
gint i;
|
40
37
|
gint len = RARRAY_LEN(targets);
|
@@ -53,15 +50,13 @@ rbatkrel_initialize(self, targets, relationship)
|
|
53
50
|
}
|
54
51
|
|
55
52
|
static VALUE
|
56
|
-
rbatkrel_get_relation_type(self)
|
57
|
-
VALUE self;
|
53
|
+
rbatkrel_get_relation_type(VALUE self)
|
58
54
|
{
|
59
55
|
return GENUM2RVAL(atk_relation_get_relation_type(_SELF(self)), ATK_TYPE_RELATION_TYPE);
|
60
56
|
}
|
61
57
|
|
62
58
|
static VALUE
|
63
|
-
rbatkrel_get_target(self)
|
64
|
-
VALUE self;
|
59
|
+
rbatkrel_get_target(VALUE self)
|
65
60
|
{
|
66
61
|
gint i;
|
67
62
|
GPtrArray* garray = atk_relation_get_target(_SELF(self));
|
@@ -76,8 +71,7 @@ rbatkrel_get_target(self)
|
|
76
71
|
|
77
72
|
#if ATK_CHECK_VERSION(1,9,0)
|
78
73
|
static VALUE
|
79
|
-
rbatkrel_add_target(self, obj)
|
80
|
-
VALUE self, obj;
|
74
|
+
rbatkrel_add_target(VALUE self, VALUE obj)
|
81
75
|
{
|
82
76
|
atk_relation_add_target(_SELF(self), ATK_OBJECT(RVAL2GOBJ(obj)));
|
83
77
|
return self;
|
data/ext/atk/rbatkrelationset.c
CHANGED
@@ -13,16 +13,14 @@
|
|
13
13
|
#define _SELF(s) (ATK_RELATION_SET(RVAL2GOBJ(s)))
|
14
14
|
|
15
15
|
static VALUE
|
16
|
-
rbatkrelset_initialize(self)
|
17
|
-
VALUE self;
|
16
|
+
rbatkrelset_initialize(VALUE self)
|
18
17
|
{
|
19
18
|
G_INITIALIZE(self, atk_relation_set_new());
|
20
19
|
return Qnil;
|
21
20
|
}
|
22
21
|
|
23
22
|
static VALUE
|
24
|
-
rbatkrelset_contains(self, relationship)
|
25
|
-
VALUE self, relationship;
|
23
|
+
rbatkrelset_contains(VALUE self, VALUE relationship)
|
26
24
|
{
|
27
25
|
return CBOOL2RVAL(atk_relation_set_contains(
|
28
26
|
_SELF(self),
|
@@ -30,31 +28,27 @@ rbatkrelset_contains(self, relationship)
|
|
30
28
|
}
|
31
29
|
|
32
30
|
static VALUE
|
33
|
-
rbatkrelset_remove(self, relation)
|
34
|
-
VALUE self, relation;
|
31
|
+
rbatkrelset_remove(VALUE self, VALUE relation)
|
35
32
|
{
|
36
33
|
atk_relation_set_remove(_SELF(self), ATK_RELATION(RVAL2GOBJ(relation)));
|
37
34
|
return self;
|
38
35
|
}
|
39
36
|
|
40
37
|
static VALUE
|
41
|
-
rbatkrelset_add(self, relation)
|
42
|
-
VALUE self, relation;
|
38
|
+
rbatkrelset_add(VALUE self, VALUE relation)
|
43
39
|
{
|
44
40
|
atk_relation_set_add(_SELF(self), ATK_RELATION(RVAL2GOBJ(relation)));
|
45
41
|
return self;
|
46
42
|
}
|
47
43
|
|
48
44
|
static VALUE
|
49
|
-
rbatkrelset_get_n_relations(self)
|
50
|
-
VALUE self;
|
45
|
+
rbatkrelset_get_n_relations(VALUE self)
|
51
46
|
{
|
52
47
|
return INT2NUM(atk_relation_set_get_n_relations(_SELF(self)));
|
53
48
|
}
|
54
49
|
|
55
50
|
static VALUE
|
56
|
-
rbatkrelset_get_relation(self, i)
|
57
|
-
VALUE self, i;
|
51
|
+
rbatkrelset_get_relation(VALUE self, VALUE i)
|
58
52
|
{
|
59
53
|
if (rb_obj_is_kind_of(i, GTYPE2CLASS(ATK_TYPE_RELATION_TYPE))){
|
60
54
|
return GOBJ2RVAL(atk_relation_set_get_relation_by_type(
|
@@ -67,8 +61,7 @@ rbatkrelset_get_relation(self, i)
|
|
67
61
|
|
68
62
|
#if ATK_CHECK_VERSION(1,9,0)
|
69
63
|
static VALUE
|
70
|
-
rbatkrelset_add_relation(self, relationship, obj)
|
71
|
-
VALUE self, relationship, obj;
|
64
|
+
rbatkrelset_add_relation(VALUE self, VALUE relationship, VALUE obj)
|
72
65
|
{
|
73
66
|
atk_relation_set_add_relation_by_type(_SELF(self),
|
74
67
|
RVAL2GENUM(relationship, ATK_TYPE_RELATION_TYPE),
|
data/ext/atk/rbatkselection.c
CHANGED
@@ -13,8 +13,7 @@
|
|
13
13
|
#define _SELF(s) (ATK_SELECTION(RVAL2GOBJ(s)))
|
14
14
|
|
15
15
|
static VALUE
|
16
|
-
rbatksel_add_selection(self, i)
|
17
|
-
VALUE self, i;
|
16
|
+
rbatksel_add_selection(VALUE self, VALUE i)
|
18
17
|
{
|
19
18
|
gboolean ret = atk_selection_add_selection(_SELF(self), NUM2INT(i));
|
20
19
|
if (! ret) rb_raise(rb_eRuntimeError, "Can't add selection");
|
@@ -22,8 +21,7 @@ rbatksel_add_selection(self, i)
|
|
22
21
|
}
|
23
22
|
|
24
23
|
static VALUE
|
25
|
-
rbatksel_clear_selection(self)
|
26
|
-
VALUE self;
|
24
|
+
rbatksel_clear_selection(VALUE self)
|
27
25
|
{
|
28
26
|
gboolean ret = atk_selection_clear_selection(_SELF(self));
|
29
27
|
if (! ret) rb_raise(rb_eRuntimeError, "Can't clear selection");
|
@@ -31,29 +29,25 @@ rbatksel_clear_selection(self)
|
|
31
29
|
}
|
32
30
|
|
33
31
|
static VALUE
|
34
|
-
rbatksel_ref_selection(self, i)
|
35
|
-
VALUE self, i;
|
32
|
+
rbatksel_ref_selection(VALUE self, VALUE i)
|
36
33
|
{
|
37
34
|
return GOBJ2RVAL(atk_selection_ref_selection(_SELF(self), NUM2INT(i)));
|
38
35
|
}
|
39
36
|
|
40
37
|
static VALUE
|
41
|
-
rbatksel_get_selection_count(self)
|
42
|
-
VALUE self;
|
38
|
+
rbatksel_get_selection_count(VALUE self)
|
43
39
|
{
|
44
40
|
return INT2NUM(atk_selection_get_selection_count(_SELF(self)));
|
45
41
|
}
|
46
42
|
|
47
43
|
static VALUE
|
48
|
-
rbatksel_is_child_selected(self, i)
|
49
|
-
VALUE self, i;
|
44
|
+
rbatksel_is_child_selected(VALUE self, VALUE i)
|
50
45
|
{
|
51
46
|
return CBOOL2RVAL(atk_selection_is_child_selected(_SELF(self), NUM2INT(i)));
|
52
47
|
}
|
53
48
|
|
54
49
|
static VALUE
|
55
|
-
rbatksel_remove_selection(self, i)
|
56
|
-
VALUE self, i;
|
50
|
+
rbatksel_remove_selection(VALUE self, VALUE i)
|
57
51
|
{
|
58
52
|
gboolean ret = atk_selection_remove_selection(_SELF(self), NUM2INT(i));
|
59
53
|
if (! ret) rb_raise(rb_eRuntimeError, "Can't remove selection");
|
@@ -61,8 +55,7 @@ rbatksel_remove_selection(self, i)
|
|
61
55
|
}
|
62
56
|
|
63
57
|
static VALUE
|
64
|
-
rbatksel_select_all_selection(self)
|
65
|
-
VALUE self;
|
58
|
+
rbatksel_select_all_selection(VALUE self)
|
66
59
|
{
|
67
60
|
return CBOOL2RVAL(atk_selection_select_all_selection(_SELF(self)));
|
68
61
|
}
|
data/ext/atk/rbatkstate.c
CHANGED
@@ -13,8 +13,7 @@
|
|
13
13
|
#define _SELF(s) (ATK_STATE(RVAL2GOBJ(s)))
|
14
14
|
|
15
15
|
static VALUE
|
16
|
-
rbatkstate_s_type_register(self, name)
|
17
|
-
VALUE self, name;
|
16
|
+
rbatkstate_s_type_register(VALUE self, VALUE name)
|
18
17
|
{
|
19
18
|
return GENUM2RVAL(atk_state_type_register(RVAL2CSTR(name)), ATK_TYPE_STATE_TYPE);
|
20
19
|
}
|
@@ -25,8 +24,7 @@ G_CONST_RETURN gchar* atk_state_type_get_name
|
|
25
24
|
*/
|
26
25
|
|
27
26
|
static VALUE
|
28
|
-
rbatkstate_s_for_name(self, name)
|
29
|
-
VALUE self, name;
|
27
|
+
rbatkstate_s_for_name(VALUE self, VALUE name)
|
30
28
|
{
|
31
29
|
return GENUM2RVAL(atk_state_type_for_name(RVAL2CSTR(name)), ATK_TYPE_STATE_TYPE);
|
32
30
|
}
|
data/ext/atk/rbatkstateset.c
CHANGED
@@ -14,31 +14,27 @@
|
|
14
14
|
#define _SELF(s) (ATK_STATE_SET(RVAL2GOBJ(s)))
|
15
15
|
|
16
16
|
static VALUE
|
17
|
-
rbatkstateset_initialize(self)
|
18
|
-
VALUE self;
|
17
|
+
rbatkstateset_initialize(VALUE self)
|
19
18
|
{
|
20
19
|
G_INITIALIZE(self, atk_state_set_new());
|
21
20
|
return Qnil;
|
22
21
|
}
|
23
22
|
|
24
23
|
static VALUE
|
25
|
-
rbatkstateset_is_empty(self)
|
26
|
-
VALUE self;
|
24
|
+
rbatkstateset_is_empty(VALUE self)
|
27
25
|
{
|
28
26
|
return CBOOL2RVAL(atk_state_set_is_empty(_SELF(self)));
|
29
27
|
}
|
30
28
|
|
31
29
|
static VALUE
|
32
|
-
rbatkstateset_add_state(self, type)
|
33
|
-
VALUE self, type;
|
30
|
+
rbatkstateset_add_state(VALUE self, VALUE type)
|
34
31
|
{
|
35
32
|
return CBOOL2RVAL(atk_state_set_add_state(_SELF(self),
|
36
33
|
RVAL2GENUM(type, ATK_TYPE_STATE_TYPE)));
|
37
34
|
}
|
38
35
|
|
39
36
|
static VALUE
|
40
|
-
rbatkstateset_add_states(self, types)
|
41
|
-
VALUE self, types;
|
37
|
+
rbatkstateset_add_states(VALUE self, VALUE types)
|
42
38
|
{
|
43
39
|
gint i;
|
44
40
|
gint n_types = RARRAY_LEN(types);
|
@@ -56,24 +52,21 @@ rbatkstateset_add_states(self, types)
|
|
56
52
|
}
|
57
53
|
|
58
54
|
static VALUE
|
59
|
-
rbatkstateset_clear_states(self)
|
60
|
-
VALUE self;
|
55
|
+
rbatkstateset_clear_states(VALUE self)
|
61
56
|
{
|
62
57
|
atk_state_set_clear_states(_SELF(self));
|
63
58
|
return self;
|
64
59
|
}
|
65
60
|
|
66
61
|
static VALUE
|
67
|
-
rbatkstateset_contains_state(self, type)
|
68
|
-
VALUE self;
|
62
|
+
rbatkstateset_contains_state(VALUE self, VALUE type)
|
69
63
|
{
|
70
64
|
return CBOOL2RVAL(atk_state_set_contains_state(_SELF(self),
|
71
65
|
RVAL2GENUM(type, ATK_TYPE_STATE_TYPE)));
|
72
66
|
}
|
73
67
|
|
74
68
|
static VALUE
|
75
|
-
rbatkstateset_contains_states(self, types)
|
76
|
-
VALUE self, types;
|
69
|
+
rbatkstateset_contains_states(VALUE self, VALUE types)
|
77
70
|
{
|
78
71
|
gint i;
|
79
72
|
gboolean ret;
|
@@ -93,30 +86,26 @@ rbatkstateset_contains_states(self, types)
|
|
93
86
|
}
|
94
87
|
|
95
88
|
static VALUE
|
96
|
-
rbatkstateset_remove_state(self, type)
|
97
|
-
VALUE self, type;
|
89
|
+
rbatkstateset_remove_state(VALUE self, VALUE type)
|
98
90
|
{
|
99
91
|
return CBOOL2RVAL(atk_state_set_remove_state(_SELF(self),
|
100
92
|
RVAL2GENUM(type, ATK_TYPE_STATE_TYPE)));
|
101
93
|
}
|
102
94
|
|
103
95
|
static VALUE
|
104
|
-
rbatkstateset_and_sets(self, compare_set)
|
105
|
-
VALUE self, compare_set;
|
96
|
+
rbatkstateset_and_sets(VALUE self, VALUE compare_set)
|
106
97
|
{
|
107
98
|
return GOBJ2RVAL(atk_state_set_and_sets(_SELF(self), _SELF(compare_set)));
|
108
99
|
}
|
109
100
|
|
110
101
|
static VALUE
|
111
|
-
rbatkstateset_or_sets(self, compare_set)
|
112
|
-
VALUE self, compare_set;
|
102
|
+
rbatkstateset_or_sets(VALUE self, VALUE compare_set)
|
113
103
|
{
|
114
104
|
return GOBJ2RVAL(atk_state_set_or_sets(_SELF(self), _SELF(compare_set)));
|
115
105
|
}
|
116
106
|
|
117
107
|
static VALUE
|
118
|
-
rbatkstateset_xor_sets(self, compare_set)
|
119
|
-
VALUE self, compare_set;
|
108
|
+
rbatkstateset_xor_sets(VALUE self, VALUE compare_set)
|
120
109
|
{
|
121
110
|
return GOBJ2RVAL(atk_state_set_xor_sets(_SELF(self), _SELF(compare_set)));
|
122
111
|
}
|