Minor API changes.

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

diff --git a/src/rb_gradient.c b/src/rb_gradient.c
index bd3fd6c9b076b7ef25f9c52aae5bb45c1cc5d3d6..a59f051fc5dbae8b3204f77019a7d7bceaa2e564 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 54 2004-08-09 10:51:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,17 +26,22 @@
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
+static void c_free (RbEvasObject *e)
+{
+       c_evas_object_free (e, true);
+}
+
 static VALUE c_new (VALUE klass, VALUE evas)
 {
        VALUE self, argv[1];
-       Evas_Object **rect;
+       RbEvasObject *rect;
 
        CHECK_CLASS (evas, cEvas);
-       GET_OBJ (evas, Evas, e);
+       GET_OBJ (evas, RbEvas, e);
 
-       self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
-                                c_evas_object_free, rect);
-       *rect = evas_object_gradient_add (*e);
+       self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
+                                c_free, rect);
+       rect->real = evas_object_gradient_add (e->real);
 
        argv[0] = evas;
        rb_obj_call_init (self, 1, argv);
@@ -44,10 +49,10 @@ static VALUE c_new (VALUE klass, VALUE evas)
        return self;
 }
 
-static VALUE c_color_add (VALUE self, VALUE r, VALUE g, VALUE b,
+static VALUE c_add_color (VALUE self, VALUE r, VALUE g, VALUE b,
                           VALUE a, VALUE distance)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
        Check_Type (r, T_FIXNUM);
        Check_Type (g, T_FIXNUM);
@@ -55,48 +60,47 @@ static VALUE c_color_add (VALUE self, VALUE r, VALUE g, VALUE b,
        Check_Type (a, T_FIXNUM);
        Check_Type (distance, T_FIXNUM);
 
-       evas_object_gradient_color_add (*e, FIX2INT (r), FIX2INT (g),
+       evas_object_gradient_color_add (e->real, FIX2INT (r), FIX2INT (g),
                                        FIX2INT (b), FIX2INT (a),
                                        FIX2INT (distance));
 
        return Qnil;
 }
 
-static VALUE c_colors_clear (VALUE self)
+static VALUE c_clear_colors (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
-       evas_object_gradient_colors_clear (*e);
+       evas_object_gradient_colors_clear (e->real);
 
        return Qnil;
 }
 
 static VALUE c_angle_get (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
-       return INT2FIX (evas_object_gradient_angle_get (*e));
+       return INT2FIX (evas_object_gradient_angle_get (e->real));
 }
 
 static VALUE c_angle_set (VALUE self, VALUE val)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
        Check_Type (val, T_FIXNUM);
 
-       evas_object_gradient_angle_set (*e, FIX2INT (val));
+       evas_object_gradient_angle_set (e->real, FIX2INT (val));
 
        return Qnil;
 }
 
 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, "add_color", c_add_color, 5);
+       rb_define_method (c, "clear_colors", c_clear_colors, 0);
+       rb_define_method (c, "angle", c_angle_get, 0);
+       rb_define_method (c, "angle=", c_angle_set, 1);
 }