We now use real structs to wrap objects.

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

diff --git a/src/rb_gradient.c b/src/rb_gradient.c
index 8030340d58a8f838d524c86c6490232da1f32ce6..e597685475aaee79671bbac0fdcd5a362acdc156 100644 (file)
--- a/src/rb_gradient.c
+++ b/src/rb_gradient.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_gradient.c 38 2004-07-25 11:27:25Z tilman $
+ * $Id: rb_gradient.c 49 2004-08-01 10:17: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);
@@ -47,7 +52,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, RbEvasObject, e);
 
        Check_Type (r, T_FIXNUM);
        Check_Type (g, T_FIXNUM);
@@ -55,7 +60,7 @@ 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));
 
@@ -64,27 +69,27 @@ 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, 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;
 }