X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_evas_object.c;h=4579de661f78e6901b64c07d5f2d9988b7a0b215;hb=6d9ee2b6cdb8aa658a063b62e3cf6375138e3aba;hp=e465bfc4dc7520de75937680ad3e8310491ced2f;hpb=1f6059ba8be27832fc4b6f88c99548e39f4264cb;p=ruby-evas.git
diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index e465bfc..4579de6 100644
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
/*
- * $Id: rb_evas_object.c 58 2004-08-10 14:10:02Z tilman $
+ * $Id: rb_evas_object.c 104 2004-08-29 15:38:46Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@ -30,6 +30,21 @@
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)
{
@@ -180,7 +195,7 @@ static VALUE c_hide (VALUE self)
* call-seq:
* e.visible? => true or false
*
- * Returns true if e is visible, else false.
+ * Returns true if e is visible, else returns false.
*/
static VALUE c_visible_get (VALUE self)
{
@@ -317,7 +332,7 @@ static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b,
* e.pass_events? => true or false
*
* Returns true if e passes events on to EvasObjects that are
- * below itself, else false.
+ * below itself, else returns false.
*/
static VALUE c_pass_events_get (VALUE self)
{
@@ -420,19 +435,10 @@ static VALUE c_stack_below (VALUE self, VALUE target)
static VALUE c_above_get (VALUE self)
{
Evas_Object *o;
- void *obj;
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;
- void *obj;
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)