Macro tweaks.

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

diff --git a/src/rb_evas.c b/src/rb_evas.c
index b6d9887030afa32cfb5e63e0f3e87db637bf41fb..029504a3bbe943281a6ab4e1537fc420fe7a5c26 100644 (file)
--- a/src/rb_evas.c
+++ b/src/rb_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas.c 29 2004-07-08 18:47:44Z tilman $
+ * $Id: rb_evas.c 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -40,7 +40,8 @@ static void c_mark (Evas **e)
 static void c_free (Evas **e)
 {
        /* do NOT call evas_free() here, since the Evas is freed
-        * by ecore_evas_free() eventually */
+        * by ecore_evas_free() eventually
+        */
        rb_hash_aset (parents, INT2NUM ((long) e), Qnil);
 
        free (e);
@@ -67,19 +68,12 @@ VALUE TO_EVAS (VALUE parent, Evas *e)
 
 static VALUE c_inspect (VALUE self)
 {
-       char buf[128];
-
-       GET_OBJ (self, Evas, e, "Evas");
-
-       snprintf (buf, sizeof (buf), "#<Evas::Evas:%p ptr=%p>",
-                 (void *) self, *e);
-
-       return rb_str_new2 (buf);
+       INSPECT (self, Evas *);
 }
 
 static VALUE c_render (VALUE self)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        evas_render (*e);
 
@@ -88,7 +82,7 @@ static VALUE c_render (VALUE self)
 
 static VALUE c_font_path_clear (VALUE self)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        evas_font_path_clear (*e);
 
@@ -97,7 +91,7 @@ static VALUE c_font_path_clear (VALUE self)
 
 static VALUE c_font_path_append (VALUE self, VALUE path)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (path, T_STRING);
 
@@ -108,7 +102,7 @@ static VALUE c_font_path_append (VALUE self, VALUE path)
 
 static VALUE c_font_path_prepend (VALUE self, VALUE path)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (path, T_STRING);
 
@@ -122,7 +116,7 @@ static VALUE c_font_path_get (VALUE self)
        VALUE ary;
        const Evas_List *list, *l;
 
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        if (!(list = evas_font_path_list (*e)))
                return rb_ary_new ();
@@ -137,14 +131,14 @@ static VALUE c_font_path_get (VALUE self)
 
 static VALUE c_font_cache_get (VALUE self)
  {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        return INT2FIX (evas_font_cache_get (*e));
 }
 
 static VALUE c_font_cache_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (val, T_FIXNUM);
 
@@ -155,7 +149,7 @@ static VALUE c_font_cache_set (VALUE self, VALUE val)
 
 static VALUE c_font_cache_flush (VALUE self)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        evas_font_cache_flush (*e);
 
@@ -164,14 +158,14 @@ static VALUE c_font_cache_flush (VALUE self)
 
 static VALUE c_image_cache_get (VALUE self)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        return INT2FIX (evas_image_cache_get (*e));
 }
 
 static VALUE c_image_cache_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (val, T_FIXNUM);
 
@@ -182,7 +176,7 @@ static VALUE c_image_cache_set (VALUE self, VALUE val)
 
 static VALUE c_image_cache_reload (VALUE self)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        evas_image_cache_reload (*e);
 
@@ -191,7 +185,7 @@ static VALUE c_image_cache_reload (VALUE self)
 
 static VALUE c_image_cache_flush (VALUE self)
 {
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        evas_image_cache_flush (*e);
 
@@ -203,7 +197,7 @@ static VALUE c_top_get (VALUE self)
        Evas_Object *o;
        void *obj;
 
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        if (!(o = evas_object_top_get (*e)))
                return Qnil;
@@ -221,7 +215,7 @@ static VALUE c_bottom_get (VALUE self)
        Evas_Object *o;
        void *obj;
 
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        if (!(o = evas_object_bottom_get (*e)))
                return Qnil;
@@ -239,7 +233,7 @@ static VALUE c_find_object (VALUE self, VALUE name)
        Evas_Object *o;
        void *obj;
 
-       GET_OBJ (self, Evas, e, "Evas");
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (name, T_STRING);