projects
/
ruby-evas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Macro tweaks.
[ruby-evas.git]
/
src
/
rb_evas_object.c
diff --git
a/src/rb_evas_object.c
b/src/rb_evas_object.c
index abba08355fc1d507c61d0c291efac686ffd01a08..52a31f5f1790df934956072fd2c520b6cfa1bac0 100644
(file)
--- a/
src/rb_evas_object.c
+++ b/
src/rb_evas_object.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_evas_object.c 3
2 2004-07-10 14:07:49
Z tilman $
+ * $Id: rb_evas_object.c 3
8 2004-07-25 11:27:25
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-50,7
+50,7
@@
void c_evas_object_mark (Evas_Object **e)
static VALUE c_init (VALUE self, VALUE parent)
{
static VALUE c_init (VALUE self, VALUE parent)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_data_set (*e, RUBY_EVAS_OBJECT_KEY, (void *) self);
evas_object_data_set (*e, RUBY_EVAS_OBJECT_KEY, (void *) self);
@@
-61,12
+61,12
@@
static VALUE c_init (VALUE self, VALUE parent)
static VALUE c_inspect (VALUE self)
{
static VALUE c_inspect (VALUE self)
{
- INSPECT (self, Evas_Object);
+ INSPECT (self, Evas_Object
*
);
}
static VALUE c_delete (VALUE self)
{
}
static VALUE c_delete (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_del (*e);
*e = NULL;
evas_object_del (*e);
*e = NULL;
@@
-76,7
+76,7
@@
static VALUE c_delete (VALUE self)
static VALUE c_resize (VALUE self, VALUE w, VALUE h)
{
static VALUE c_resize (VALUE self, VALUE w, VALUE h)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
Check_Type (w, T_FIXNUM);
Check_Type (h, T_FIXNUM);
Check_Type (w, T_FIXNUM);
Check_Type (h, T_FIXNUM);
@@
-89,7
+89,7
@@
static VALUE c_resize (VALUE self, VALUE w, VALUE h)
static VALUE c_move (VALUE self, VALUE x, VALUE y)
{
static VALUE c_move (VALUE self, VALUE x, VALUE y)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
Check_Type (x, T_FIXNUM);
Check_Type (y, T_FIXNUM);
Check_Type (x, T_FIXNUM);
Check_Type (y, T_FIXNUM);
@@
-104,7
+104,7
@@
static VALUE c_geometry_get (VALUE self)
{
int x = 0, y = 0, w = 0, h = 0;
{
int x = 0, y = 0, w = 0, h = 0;
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_geometry_get (*e, (Evas_Coord *) &x, (Evas_Coord *) &y,
(Evas_Coord *) & w, (Evas_Coord *) &h);
evas_object_geometry_get (*e, (Evas_Coord *) &x, (Evas_Coord *) &y,
(Evas_Coord *) & w, (Evas_Coord *) &h);
@@
-115,7
+115,7
@@
static VALUE c_geometry_get (VALUE self)
static VALUE c_show (VALUE self)
{
static VALUE c_show (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_show (*e);
evas_object_show (*e);
@@
-124,7
+124,7
@@
static VALUE c_show (VALUE self)
static VALUE c_hide (VALUE self)
{
static VALUE c_hide (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_hide (*e);
evas_object_hide (*e);
@@
-133,14
+133,14
@@
static VALUE c_hide (VALUE self)
static VALUE c_visible_get (VALUE self)
{
static VALUE c_visible_get (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
return evas_object_visible_get (*e) ? Qtrue : Qfalse;
}
static VALUE c_evas_get (VALUE self)
{
return evas_object_visible_get (*e) ? Qtrue : Qfalse;
}
static VALUE c_evas_get (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
return rb_hash_aref (parents, INT2NUM ((long) (e)));
}
return rb_hash_aref (parents, INT2NUM ((long) (e)));
}
@@
-149,7
+149,7
@@
static VALUE c_name_get (VALUE self)
{
const char *name;
{
const char *name;
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
if (!(name = evas_object_name_get (*e)))
return Qnil;
if (!(name = evas_object_name_get (*e)))
return Qnil;
@@
-159,7
+159,7
@@
static VALUE c_name_get (VALUE self)
static VALUE c_name_set (VALUE self, VALUE val)
{
static VALUE c_name_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
Check_Type (val, T_STRING);
Check_Type (val, T_STRING);
@@
-170,14
+170,14
@@
static VALUE c_name_set (VALUE self, VALUE val)
static VALUE c_layer_get (VALUE self)
{
static VALUE c_layer_get (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
return INT2FIX (evas_object_layer_get (*e));
}
static VALUE c_layer_set (VALUE self, VALUE val)
{
return INT2FIX (evas_object_layer_get (*e));
}
static VALUE c_layer_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
Check_Type (val, T_FIXNUM);
Check_Type (val, T_FIXNUM);
@@
-190,7
+190,7
@@
static VALUE c_get_color (VALUE self)
{
int r = 0, g = 0, b = 0, a = 0;
{
int r = 0, g = 0, b = 0, a = 0;
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_color_get (*e, &r, &g, &b, &a);
evas_object_color_get (*e, &r, &g, &b, &a);
@@
-201,7
+201,7
@@
static VALUE c_get_color (VALUE self)
static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
VALUE a)
{
static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
VALUE a)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
Check_Type (r, T_FIXNUM);
Check_Type (g, T_FIXNUM);
Check_Type (r, T_FIXNUM);
Check_Type (g, T_FIXNUM);
@@
-216,14
+216,14
@@
static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
static VALUE c_pass_events_get (VALUE self)
{
static VALUE c_pass_events_get (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
return evas_object_pass_events_get (*e) ? Qtrue : Qfalse;
}
static VALUE c_pass_events_set (VALUE self, VALUE val)
{
return evas_object_pass_events_get (*e) ? Qtrue : Qfalse;
}
static VALUE c_pass_events_set (VALUE self, VALUE val)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
CHECK_BOOL (val);
CHECK_BOOL (val);
@@
-234,7
+234,7
@@
static VALUE c_pass_events_set (VALUE self, VALUE val)
static VALUE c_raise (VALUE self)
{
static VALUE c_raise (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_raise (*e);
evas_object_raise (*e);
@@
-243,7
+243,7
@@
static VALUE c_raise (VALUE self)
static VALUE c_lower (VALUE self)
{
static VALUE c_lower (VALUE self)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
evas_object_lower (*e);
evas_object_lower (*e);
@@
-252,7
+252,7
@@
static VALUE c_lower (VALUE self)
static VALUE c_stack_above (VALUE self, VALUE target)
{
static VALUE c_stack_above (VALUE self, VALUE target)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
if (!rb_obj_is_kind_of (target, cEvasObject)) {
rb_raise (rb_eTypeError,
if (!rb_obj_is_kind_of (target, cEvasObject)) {
rb_raise (rb_eTypeError,
@@
-261,7
+261,7
@@
static VALUE c_stack_above (VALUE self, VALUE target)
return Qnil;
}
return Qnil;
}
- GET_OBJ (target, Evas_Object, target2);
+ GET_OBJ (target, Evas_Object
*
, target2);
evas_object_stack_above (*e, *target2);
evas_object_stack_above (*e, *target2);
@@
-270,7
+270,7
@@
static VALUE c_stack_above (VALUE self, VALUE target)
static VALUE c_stack_below (VALUE self, VALUE target)
{
static VALUE c_stack_below (VALUE self, VALUE target)
{
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
if (!rb_obj_is_kind_of (target, cEvasObject)) {
rb_raise (rb_eTypeError,
if (!rb_obj_is_kind_of (target, cEvasObject)) {
rb_raise (rb_eTypeError,
@@
-279,7
+279,7
@@
static VALUE c_stack_below (VALUE self, VALUE target)
return Qnil;
}
return Qnil;
}
- GET_OBJ (target, Evas_Object, target2);
+ GET_OBJ (target, Evas_Object
*
, target2);
evas_object_stack_below (*e, *target2);
evas_object_stack_below (*e, *target2);
@@
-291,7
+291,7
@@
static VALUE c_above_get (VALUE self)
Evas_Object *o;
void *obj;
Evas_Object *o;
void *obj;
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
if (!(evas_object_above_get (*e)))
return Qnil;
if (!(evas_object_above_get (*e)))
return Qnil;
@@
-309,7
+309,7
@@
static VALUE c_below_get (VALUE self)
Evas_Object *o;
void *obj;
Evas_Object *o;
void *obj;
- GET_OBJ (self, Evas_Object, e);
+ GET_OBJ (self, Evas_Object
*
, e);
if (!(evas_object_below_get (*e)))
return Qnil;
if (!(evas_object_below_get (*e)))
return Qnil;