We now use real structs to wrap objects.

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

diff --git a/src/rb_rectangle.c b/src/rb_rectangle.c
index e2e307bf5f9c401f25299ef7f188b536c2dcf8ac..a058fa627c7c582f2fe758b83c5d1dbda7f2e1d5 100644 (file)
--- a/src/rb_rectangle.c
+++ b/src/rb_rectangle.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_rectangle.c 23 2004-06-26 22:55:31Z tilman $
+ * $Id: rb_rectangle.c 49 2004-08-01 10:17:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,23 +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;
-
-       if (!rb_obj_is_kind_of (evas, cEvas)) {
-               rb_raise (rb_eTypeError,
-                         "wrong argument type %s (expected Evas)",
-                         rb_obj_classname (evas));
-               return Qnil;
-       }
+       RbEvasObject *rect;
 
-       GET_OBJ (evas, Evas, e, "Evas");
+       CHECK_CLASS (evas, cEvas);
+       GET_OBJ (evas, RbEvas, e);
 
-       self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
-                                c_evas_object_free, rect);
-       *rect = evas_object_rectangle_add (*e);
+       self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
+                                c_free, rect);
+       rect->real = evas_object_rectangle_add (e->real);
 
        argv[0] = evas;
        rb_obj_call_init (self, 1, argv);
@@ -52,8 +51,7 @@ static VALUE c_new (VALUE klass, VALUE evas)
 
 void Init_Rectangle (void)
 {
-       VALUE cRect = rb_define_class_under (mEvas, "Rectangle",
-                                            cEvasObject);
+       VALUE c = rb_define_class_under (mEvas, "Rectangle", cEvasObject);
 
-       rb_define_singleton_method (cRect, "new", c_new, 1);
+       rb_define_singleton_method (c, "new", c_new, 1);
 }