Macro tweaks.

diff --git a/src/rb_evas.c b/src/rb_evas.c
index 0300f4d1353262a22023f44fa5439a40e79d7364..029504a3bbe943281a6ab4e1537fc420fe7a5c26 100644 (file)
--- a/src/rb_evas.c
+++ b/src/rb_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas.c 32 2004-07-10 14:07:49Z 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,12 +68,12 @@ VALUE TO_EVAS (VALUE parent, Evas *e)
 
 static VALUE c_inspect (VALUE self)
 {
-       INSPECT (self, Evas);
+       INSPECT (self, Evas *);
 }
 
 static VALUE c_render (VALUE self)
 {
-       GET_OBJ (self, Evas, e);
+       GET_OBJ (self, Evas *, e);
 
        evas_render (*e);
 
@@ -81,7 +82,7 @@ static VALUE c_render (VALUE self)
 
 static VALUE c_font_path_clear (VALUE self)
 {
-       GET_OBJ (self, Evas, e);
+       GET_OBJ (self, Evas *, e);
 
        evas_font_path_clear (*e);
 
@@ -90,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);
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (path, T_STRING);
 
@@ -101,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);
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (path, T_STRING);
 
@@ -115,7 +116,7 @@ static VALUE c_font_path_get (VALUE self)
        VALUE ary;
        const Evas_List *list, *l;
 
-       GET_OBJ (self, Evas, e);
+       GET_OBJ (self, Evas *, e);
 
        if (!(list = evas_font_path_list (*e)))
                return rb_ary_new ();
@@ -130,14 +131,14 @@ static VALUE c_font_path_get (VALUE self)
 
 static VALUE c_font_cache_get (VALUE self)
  {
-       GET_OBJ (self, Evas, e);
+       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);
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (val, T_FIXNUM);
 
@@ -148,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);
+       GET_OBJ (self, Evas *, e);
 
        evas_font_cache_flush (*e);
 
@@ -157,14 +158,14 @@ static VALUE c_font_cache_flush (VALUE self)
 
 static VALUE c_image_cache_get (VALUE self)
 {
-       GET_OBJ (self, Evas, e);
+       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);
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (val, T_FIXNUM);
 
@@ -175,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);
+       GET_OBJ (self, Evas *, e);
 
        evas_image_cache_reload (*e);
 
@@ -184,7 +185,7 @@ static VALUE c_image_cache_reload (VALUE self)
 
 static VALUE c_image_cache_flush (VALUE self)
 {
-       GET_OBJ (self, Evas, e);
+       GET_OBJ (self, Evas *, e);
 
        evas_image_cache_flush (*e);
 
@@ -196,7 +197,7 @@ static VALUE c_top_get (VALUE self)
        Evas_Object *o;
        void *obj;
 
-       GET_OBJ (self, Evas, e);
+       GET_OBJ (self, Evas *, e);
 
        if (!(o = evas_object_top_get (*e)))
                return Qnil;
@@ -214,7 +215,7 @@ static VALUE c_bottom_get (VALUE self)
        Evas_Object *o;
        void *obj;
 
-       GET_OBJ (self, Evas, e);
+       GET_OBJ (self, Evas *, e);
 
        if (!(o = evas_object_bottom_get (*e)))
                return Qnil;
@@ -232,7 +233,7 @@ static VALUE c_find_object (VALUE self, VALUE name)
        Evas_Object *o;
        void *obj;
 
-       GET_OBJ (self, Evas, e);
+       GET_OBJ (self, Evas *, e);
 
        Check_Type (name, T_STRING);
 

diff --git a/src/rb_evas_main.h b/src/rb_evas_main.h
index 762c3a61a2fc01a8a37ce0bc44253cb749fc6d6f..be8700a35512ad0b615c2bc9fd42186a8e3b8f6c 100644 (file)
--- a/src/rb_evas_main.h
+++ b/src/rb_evas_main.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_main.h 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_evas_main.h 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -22,9 +22,9 @@
 #define __RB_EVAS_MAIN_H
 
 #define GET_OBJ(obj, type, o) \
-       type **(o) = NULL; \
+       type *(o) = NULL; \
 \
-       Data_Get_Struct ((obj), type *, (o)); \
+       Data_Get_Struct ((obj), type, (o)); \
 \
        if (!*(o)) { \
                rb_raise (rb_eException, \
@@ -46,7 +46,7 @@
                rb_raise (rb_eTypeError, \
                          "wrong argument type %s (expected %s)", \
                          rb_obj_classname ((val)), \
-                         rb_obj_classname ((klass))); \
+                         rb_class2name ((klass))); \
                return Qnil; \
        }
 

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 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_evas_object.c 38 2004-07-25 11:27:25Z tilman $
  *
  * 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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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)
 {
-       INSPECT (self, Evas_Object);
+       INSPECT (self, Evas_Object *);
 }
 
 static VALUE c_delete (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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;
 
-       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);
@@ -115,7 +115,7 @@ static VALUE c_geometry_get (VALUE self)
 
 static VALUE c_show (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_show (*e);
 
@@ -124,7 +124,7 @@ static VALUE c_show (VALUE self)
 
 static VALUE c_hide (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_hide (*e);
 
@@ -133,14 +133,14 @@ static VALUE c_hide (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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        return rb_hash_aref (parents, INT2NUM ((long) (e)));
 }
@@ -149,7 +149,7 @@ static VALUE c_name_get (VALUE self)
 {
        const char *name;
 
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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)
 {
-       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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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;
 
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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)
 {
-       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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        CHECK_BOOL (val);
 
@@ -234,7 +234,7 @@ static VALUE c_pass_events_set (VALUE self, VALUE val)
 
 static VALUE c_raise (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_raise (*e);
 
@@ -243,7 +243,7 @@ static VALUE c_raise (VALUE self)
 
 static VALUE c_lower (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_lower (*e);
 
@@ -252,7 +252,7 @@ static VALUE c_lower (VALUE self)
 
 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,
@@ -261,7 +261,7 @@ static VALUE c_stack_above (VALUE self, VALUE target)
                return Qnil;
        }
 
-       GET_OBJ (target, Evas_Object, target2);
+       GET_OBJ (target, Evas_Object *, 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)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        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;
        }
 
-       GET_OBJ (target, Evas_Object, target2);
+       GET_OBJ (target, Evas_Object *, target2);
 
        evas_object_stack_below (*e, *target2);
 
@@ -291,7 +291,7 @@ static VALUE c_above_get (VALUE self)
        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;
@@ -309,7 +309,7 @@ static VALUE c_below_get (VALUE self)
        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;

diff --git a/src/rb_gradient.c b/src/rb_gradient.c
index bd3fd6c9b076b7ef25f9c52aae5bb45c1cc5d3d6..8030340d58a8f838d524c86c6490232da1f32ce6 100644 (file)
--- a/src/rb_gradient.c
+++ b/src/rb_gradient.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_gradient.c 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_gradient.c 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -32,7 +32,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
        Evas_Object **rect;
 
        CHECK_CLASS (evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       GET_OBJ (evas, Evas *, e);
 
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
                                 c_evas_object_free, rect);
@@ -47,7 +47,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
 static VALUE c_color_add (VALUE self, VALUE r, VALUE g, VALUE b,
                           VALUE a, VALUE distance)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        Check_Type (r, T_FIXNUM);
        Check_Type (g, T_FIXNUM);
@@ -64,7 +64,7 @@ static VALUE c_color_add (VALUE self, VALUE r, VALUE g, VALUE b,
 
 static VALUE c_colors_clear (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_gradient_colors_clear (*e);
 
@@ -73,14 +73,14 @@ static VALUE c_colors_clear (VALUE self)
 
 static VALUE c_angle_get (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        return INT2FIX (evas_object_gradient_angle_get (*e));
 }
 
 static VALUE c_angle_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        Check_Type (val, T_FIXNUM);
 
@@ -91,12 +91,11 @@ static VALUE c_angle_set (VALUE self, VALUE val)
 
 void Init_Gradient (void)
 {
-       VALUE cGradient = rb_define_class_under (mEvas, "Gradient",
-                                                cEvasObject);
-
-       rb_define_singleton_method (cGradient, "new", c_new, 1);
-       rb_define_method (cGradient, "color_add", c_color_add, 5);
-       rb_define_method (cGradient, "colors_clear", c_colors_clear, 0);
-       rb_define_method (cGradient, "angle", c_angle_get, 0);
-       rb_define_method (cGradient, "angle=", c_angle_set, 1);
+       VALUE c = rb_define_class_under (mEvas, "Gradient", cEvasObject);
+
+       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "color_add", c_color_add, 5);
+       rb_define_method (c, "colors_clear", c_colors_clear, 0);
+       rb_define_method (c, "angle", c_angle_get, 0);
+       rb_define_method (c, "angle=", c_angle_set, 1);
 }

diff --git a/src/rb_image.c b/src/rb_image.c
index e88eddcb0f71e87ca8fb7e161f693b53b159bf9b..cff6905f84a8a0be9df6c6173c4049e1b3493194 100644 (file)
--- a/src/rb_image.c
+++ b/src/rb_image.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_image.c 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_image.c 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -32,7 +32,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
        Evas_Object **rect;
 
        CHECK_CLASS (evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       GET_OBJ (evas, Evas *, e);
 
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
                                 c_evas_object_free, rect);
@@ -46,7 +46,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
 
 void Init_Image (void)
 {
-       VALUE cImage = rb_define_class_under (mEvas, "Image", cEvasObject);
+       VALUE c = rb_define_class_under (mEvas, "Image", cEvasObject);
 
-       rb_define_singleton_method (cImage, "new", c_new, 1);
+       rb_define_singleton_method (c, "new", c_new, 1);
 }

diff --git a/src/rb_line.c b/src/rb_line.c
index 0710836710221548ae00cbd61c2674866fe778f9..36179e3bd75bc29675eb8bb2ded7492ab4972cd0 100644 (file)
--- a/src/rb_line.c
+++ b/src/rb_line.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_line.c 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_line.c 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -32,7 +32,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
        Evas_Object **rect;
 
        CHECK_CLASS (evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       GET_OBJ (evas, Evas *, e);
 
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
                                 c_evas_object_free, rect);
@@ -48,7 +48,7 @@ static VALUE c_get_xy (VALUE self)
 {
        int coord[4] = {0, 0, 0, 0};
 
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_line_xy_get (*e, &coord[0], &coord[1],
                                 &coord[2], &coord[3]);
@@ -60,7 +60,7 @@ static VALUE c_get_xy (VALUE self)
 static VALUE c_set_xy (VALUE self, VALUE x1, VALUE y1,
                        VALUE x2, VALUE y2)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        Check_Type (x1, T_FIXNUM);
        Check_Type (y1, T_FIXNUM);
@@ -75,9 +75,9 @@ static VALUE c_set_xy (VALUE self, VALUE x1, VALUE y1,
 
 void Init_Line (void)
 {
-       VALUE cLine = rb_define_class_under (mEvas, "Line", cEvasObject);
+       VALUE c = rb_define_class_under (mEvas, "Line", cEvasObject);
 
-       rb_define_singleton_method (cLine, "new", c_new, 1);
-       rb_define_method (cLine, "get_xy", c_get_xy, 0);
-       rb_define_method (cLine, "set_xy", c_set_xy, 4);
+       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "get_xy", c_get_xy, 0);
+       rb_define_method (c, "set_xy", c_set_xy, 4);
 }

diff --git a/src/rb_polygon.c b/src/rb_polygon.c
index 438fd3aef7c753ae83f992e8abf7511a5e0c9c2d..7d2b40ab5acceaf01ddfad7db70cbc1081737cb1 100644 (file)
--- a/src/rb_polygon.c
+++ b/src/rb_polygon.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_polygon.c 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_polygon.c 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -32,7 +32,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
        Evas_Object **rect;
 
        CHECK_CLASS (evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       GET_OBJ (evas, Evas *, e);
 
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
                                 c_evas_object_free, rect);
@@ -46,7 +46,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
 
 static VALUE c_point_add (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);
@@ -58,7 +58,7 @@ static VALUE c_point_add (VALUE self, VALUE x, VALUE y)
 
 static VALUE c_points_clear (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_polygon_points_clear (*e);
 
@@ -67,10 +67,9 @@ static VALUE c_points_clear (VALUE self)
 
 void Init_Polygon (void)
 {
-       VALUE cPolygon = rb_define_class_under (mEvas, "Polygon",
-                                               cEvasObject);
+       VALUE c = rb_define_class_under (mEvas, "Polygon", cEvasObject);
 
-       rb_define_singleton_method (cPolygon, "new", c_new, 1);
-       rb_define_method (cPolygon, "point_add", c_point_add, 2);
-       rb_define_method (cPolygon, "points_clear", c_points_clear, 0);
+       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "point_add", c_point_add, 2);
+       rb_define_method (c, "points_clear", c_points_clear, 0);
 }

diff --git a/src/rb_rectangle.c b/src/rb_rectangle.c
index 2c4901eb74b534bd9120020e7c88ecaf378c3980..b881687e6d60a0ed66c1f5c90484c4c8cb57ae23 100644 (file)
--- a/src/rb_rectangle.c
+++ b/src/rb_rectangle.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_rectangle.c 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_rectangle.c 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,8 +31,8 @@ static VALUE c_new (VALUE klass, VALUE evas)
        VALUE self, argv[1];
        Evas_Object **rect;
 
-       CHECK_CLASS(evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       CHECK_CLASS (evas, cEvas);
+       GET_OBJ (evas, Evas *, e);
 
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
                                 c_evas_object_free, rect);
@@ -46,8 +46,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
 
 void Init_Rectangle (void)
 {
-       VALUE cRect = rb_define_class_under (mEvas, "Rectangle",
-                                            cEvasObject);
+       VALUE c = rb_define_class_under (mEvas, "Rectangle", cEvasObject);
 
-       rb_define_singleton_method (cRect, "new", c_new, 1);
+       rb_define_singleton_method (c, "new", c_new, 1);
 }

diff --git a/src/rb_text.c b/src/rb_text.c
index dfb5cc7b1b90d5158177967f15b311ac79c57347..4224e9883180b4ea2a59a0d03322692a2b94f342 100644 (file)
--- a/src/rb_text.c
+++ b/src/rb_text.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_text.c 32 2004-07-10 14:07:49Z tilman $
+ * $Id: rb_text.c 38 2004-07-25 11:27:25Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,8 +31,8 @@ static VALUE c_new (VALUE klass, VALUE evas)
        VALUE self, argv[1];
        Evas_Object **rect;
 
-       CHECK_CLASS(evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       CHECK_CLASS (evas, cEvas);
+       GET_OBJ (evas, Evas *, e);
 
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
                                 c_evas_object_free, rect);
@@ -48,7 +48,7 @@ static VALUE c_font_source_get (VALUE self)
 {
        const char *tmp;
 
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        if (!(tmp = evas_object_text_font_source_get (*e)))
                return Qnil;
@@ -58,7 +58,7 @@ static VALUE c_font_source_get (VALUE self)
 
 static VALUE c_font_source_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        Check_Type (val, T_STRING);
 
@@ -72,7 +72,7 @@ static VALUE c_get_font (VALUE self)
        char *font = NULL;
        Evas_Font_Size size = 0;
 
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        evas_object_text_font_get (*e, &font, &size);
 
@@ -82,7 +82,7 @@ static VALUE c_get_font (VALUE self)
 
 static VALUE c_set_font (VALUE self, VALUE font, VALUE size)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        Check_Type (font, T_STRING);
        Check_Type (font, T_FIXNUM);
@@ -97,7 +97,7 @@ static VALUE c_text_get (VALUE self)
 {
        const char *tmp;
 
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        if (!(tmp = evas_object_text_text_get (*e)))
                return Qnil;
@@ -107,7 +107,7 @@ static VALUE c_text_get (VALUE self)
 
 static VALUE c_text_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, Evas_Object *, e);
 
        Check_Type (val, T_STRING);
 
@@ -118,13 +118,13 @@ static VALUE c_text_set (VALUE self, VALUE val)
 
 void Init_Text (void)
 {
-       VALUE cText = rb_define_class_under (mEvas, "Text", cEvasObject);
-
-       rb_define_singleton_method (cText, "new", c_new, 1);
-       rb_define_method (cText, "font_source", c_font_source_get, 0);
-       rb_define_method (cText, "font_source=", c_font_source_set, 1);
-       rb_define_method (cText, "get_font", c_get_font, 0);
-       rb_define_method (cText, "set_font", c_set_font, 2);
-       rb_define_method (cText, "text", c_text_get, 0);
-       rb_define_method (cText, "text=", c_text_set, 1);
+       VALUE c = rb_define_class_under (mEvas, "Text", cEvasObject);
+
+       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "font_source", c_font_source_get, 0);
+       rb_define_method (c, "font_source=", c_font_source_set, 1);
+       rb_define_method (c, "get_font", c_get_font, 0);
+       rb_define_method (c, "set_font", c_set_font, 2);
+       rb_define_method (c, "text", c_text_get, 0);
+       rb_define_method (c, "text=", c_text_set, 1);
 }