We now use real structs to wrap objects.

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

diff --git a/src/rb_line.c b/src/rb_line.c
index 36179e3bd75bc29675eb8bb2ded7492ab4972cd0..59986df89360f4831ad196e847d3d0da648c56f1 100644 (file)
--- a/src/rb_line.c
+++ b/src/rb_line.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_line.c 38 2004-07-25 11:27:25Z tilman $
+ * $Id: rb_line.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 *line;
 
        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_line_add (*e);
+       self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
+                                c_free, line);
+       line->real = evas_object_line_add (e->real);
 
        argv[0] = evas;
        rb_obj_call_init (self, 1, argv);
@@ -48,9 +53,9 @@ static VALUE c_get_xy (VALUE self)
 {
        int coord[4] = {0, 0, 0, 0};
 
-       GET_OBJ (self, Evas_Object *, e);
+       GET_OBJ (self, RbEvasObject, e);
 
-       evas_object_line_xy_get (*e, &coord[0], &coord[1],
+       evas_object_line_xy_get (e->real, &coord[0], &coord[1],
                                 &coord[2], &coord[3]);
 
        return rb_ary_new3 (4, INT2FIX (coord[0]), INT2FIX (coord[1]),
@@ -60,14 +65,14 @@ 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, RbEvasObject, e);
 
        Check_Type (x1, T_FIXNUM);
        Check_Type (y1, T_FIXNUM);
        Check_Type (x2, T_FIXNUM);
        Check_Type (y2, T_FIXNUM);
 
-       evas_object_line_xy_set (*e, FIX2INT (x1), FIX2INT (y1),
+       evas_object_line_xy_set (e->real, FIX2INT (x1), FIX2INT (y1),
                                 FIX2INT (x2), FIX2INT (y2));
 
        return Qnil;