Added keywords, updated GET_OBJ macro.

[ruby-evas.git] / src / rb_evas_object.c

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 57dd2a6a946275472dc953e84b70ecb556db87c5..cd448bfa76dfc29cca84372d90262a9cce6f9eb5 100644 (file)
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: rb_evas_object.c 2 2004-06-19 18:55:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -24,13 +24,13 @@
 
 #include "rb_evas_object.h"
 
-#define GET_OBJ(obj, e) \
-       Evas_Object **(e) = NULL; \
+#define GET_OBJ(obj, type, o, desc) \
+       type **(o) = NULL; \
 \
-       Data_Get_Struct ((obj), Evas_Object *, (e)); \
+       Data_Get_Struct ((obj), type *, (o)); \
 \
-       if (!*(e)) { \
-               rb_raise (rb_eException, "EvasObject destroyed already"); \
+       if (!*(o)) { \
+               rb_raise (rb_eException, desc " destroyed already"); \
                return Qnil; \
        }
 
@@ -56,7 +56,7 @@ void c_evas_object_mark (Evas_Object **e)
 
 static VALUE c_init (VALUE self, VALUE parent)
 {
-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");
 
        rb_hash_aset (parents, INT2NUM ((long) e), parent);
 
@@ -65,7 +65,7 @@ static VALUE c_init (VALUE self, VALUE parent)
 
 static VALUE c_delete (VALUE self)
 {
-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");
 
        if (*e) {
                evas_object_del (*e);
@@ -77,7 +77,7 @@ static VALUE c_delete (VALUE self)
 
 static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 {
-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");
 
        Check_Type (w, T_FIXNUM);
        Check_Type (h, T_FIXNUM);
@@ -90,7 +90,7 @@ static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 
 static VALUE c_show (VALUE self)
 {
-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");
 
        evas_object_show (*e);
 
@@ -99,7 +99,7 @@ static VALUE c_show (VALUE self)
 
 static VALUE c_hide (VALUE self)
 {
-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");
 
        evas_object_hide (*e);
 
@@ -108,7 +108,7 @@ static VALUE c_hide (VALUE self)
 
 static VALUE c_is_visible (VALUE self)
 {
-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");
 
        return evas_object_visible_get (*e) ? Qtrue : Qfalse;
 }