projects
/
ruby-evas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweaked TO_EVAS_OBJECT() calls.
[ruby-evas.git]
/
src
/
rb_evas_object.c
diff --git
a/src/rb_evas_object.c
b/src/rb_evas_object.c
index 6c0a90f99498f4d6ea7f68c908765de73bd7b3bc..4579de661f78e6901b64c07d5f2d9988b7a0b215 100644
(file)
--- a/
src/rb_evas_object.c
+++ b/
src/rb_evas_object.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_evas_object.c
64 2004-08-12 19:37:04
Z tilman $
+ * $Id: rb_evas_object.c
104 2004-08-29 15:38:46
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-30,6
+30,21
@@
VALUE cEvasObject;
VALUE cEvasObject;
+VALUE TO_EVAS_OBJECT (Evas_Object *o)
+{
+ void *obj;
+
+ if (!o)
+ return Qnil;
+
+ if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
+ rb_raise (rb_eException, "EvasObject Ruby object key missing");
+ return Qnil;
+ }
+
+ return (VALUE) obj;
+}
+
/* called by the child classes */
void c_evas_object_mark (RbEvasObject *e)
{
/* called by the child classes */
void c_evas_object_mark (RbEvasObject *e)
{
@@
-420,19
+435,10
@@
static VALUE c_stack_below (VALUE self, VALUE target)
static VALUE c_above_get (VALUE self)
{
Evas_Object *o;
static VALUE c_above_get (VALUE self)
{
Evas_Object *o;
- void *obj;
GET_OBJ (self, RbEvasObject, e);
GET_OBJ (self, RbEvasObject, e);
- if (!(o = evas_object_above_get (e->real)))
- return Qnil;
-
- if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
- rb_raise (rb_eException, "EvasObject Ruby object key missing");
- return Qnil;
- }
-
- return (VALUE) obj;
+ return TO_EVAS_OBJECT (evas_object_above_get (e->real));
}
/*
}
/*
@@
-445,19
+451,10
@@
static VALUE c_above_get (VALUE self)
static VALUE c_below_get (VALUE self)
{
Evas_Object *o;
static VALUE c_below_get (VALUE self)
{
Evas_Object *o;
- void *obj;
GET_OBJ (self, RbEvasObject, e);
GET_OBJ (self, RbEvasObject, e);
- if (!(o = evas_object_below_get (e->real)))
- return Qnil;
-
- if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
- rb_raise (rb_eException, "EvasObject Ruby object key missing");
- return Qnil;
- }
-
- return (VALUE) obj;
+ return TO_EVAS_OBJECT (evas_object_below_get (e->real));
}
void Init_EvasObject (void)
}
void Init_EvasObject (void)