Minor API changes.

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

diff --git a/src/rb_polygon.c b/src/rb_polygon.c
index 438fd3aef7c753ae83f992e8abf7511a5e0c9c2d..8c4cc139af03a3052b4295fc26108a1918601538 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 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 *poly;
 
        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_polygon_add (*e);
+       self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
+                                c_free, poly);
+       poly->real = evas_object_polygon_add (e->real);
 
        argv[0] = evas;
        rb_obj_call_init (self, 1, argv);
@@ -44,33 +49,32 @@ static VALUE c_new (VALUE klass, VALUE evas)
        return self;
 }
 
-static VALUE c_point_add (VALUE self, VALUE x, VALUE y)
+static VALUE c_add_point (VALUE self, VALUE x, VALUE y)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
        Check_Type (x, T_FIXNUM);
        Check_Type (y, T_FIXNUM);
 
-       evas_object_polygon_point_add (*e, FIX2INT (x), FIX2INT (y));
+       evas_object_polygon_point_add (e->real, FIX2INT (x), FIX2INT (y));
 
        return Qnil;
 }
 
-static VALUE c_points_clear (VALUE self)
+static VALUE c_clear_points (VALUE self)
 {
-       GET_OBJ (self, Evas_Object, e);
+       GET_OBJ (self, RbEvasObject, e);
 
-       evas_object_polygon_points_clear (*e);
+       evas_object_polygon_points_clear (e->real);
 
        return Qnil;
 }
 
 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, "add_point", c_add_point, 2);
+       rb_define_method (c, "clear_points", c_clear_points, 0);
 }