Class instantiation fixes.

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

diff --git a/src/rb_polygon.c b/src/rb_polygon.c
index 9a8913c116ea010397a0318a67de27958373eebb..39f1dafa4221e81b53bd49d024ff2fcc78436495 100644 (file)
--- a/src/rb_polygon.c
+++ b/src/rb_polygon.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_polygon.c 58 2004-08-10 14:10:02Z tilman $
+ * $Id: rb_polygon.c 354 2006-02-10 18:14:08Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,31 +26,21 @@
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
-static void c_free (RbEvasObject *e)
-{
-       c_evas_object_free (e, true);
-}
-
 /*
  * call-seq:
  *  Evas::Polygon.new(evas) => polygon
  *
  * Creates an new Evas::Polygon object.
  */
-static VALUE c_new (VALUE klass, VALUE evas)
+static VALUE c_init (VALUE self, VALUE evas)
 {
-       VALUE self, argv[1];
-       RbEvasObject *poly;
-
        CHECK_CLASS (evas, cEvas);
        GET_OBJ (evas, RbEvas, e);
+       GET_OBJ (self, RbEvasObject, poly);
 
-       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);
+       rb_call_super (1, &evas);
 
        return self;
 }
@@ -92,7 +82,7 @@ void Init_Polygon (void)
 {
        VALUE c = rb_define_class_under (mEvas, "Polygon", cEvasObject);
 
-       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "initialize", c_init, 1);
        rb_define_method (c, "add_point", c_add_point, 2);
        rb_define_method (c, "clear_points", c_clear_points, 0);
 }