X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_line.c;h=59986df89360f4831ad196e847d3d0da648c56f1;hb=8efd0235a6bb26710fd89dd07a5fdb55cafde247;hp=e75f2bc890a5f892c22f66a1f699cb60abb80325;hpb=ba05ccf5a7b503e2d9a58c1de4072312b5abfab7;p=ruby-evas.git

diff --git a/src/rb_line.c b/src/rb_line.c
index e75f2bc..59986df 100644
--- a/src/rb_line.c
+++ b/src/rb_line.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_line.c 23 2004-06-26 22:55:31Z tilman $
+ * $Id: rb_line.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 *line;
 
-	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_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);
@@ -54,9 +53,9 @@ static VALUE c_get_xy (VALUE self)
 {
 	int coord[4] = {0, 0, 0, 0};
 
-	GET_OBJ (self, Evas_Object, e, "Line");
+	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]),
@@ -66,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, "Line");
+	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;
@@ -81,9 +80,9 @@ static VALUE c_set_xy (VALUE self, VALUE x1, VALUE y1,
 
 void Init_Line (void)
 {
-	VALUE cLine = rb_define_class_under (mEvas, "Line", cEvasObject);
+	VALUE c = rb_define_class_under (mEvas, "Line", cEvasObject);
 
-	rb_define_singleton_method (cLine, "new", c_new, 1);
-	rb_define_method (cLine, "get_xy", c_get_xy, 0);
-	rb_define_method (cLine, "set_xy", c_set_xy, 4);
+	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "get_xy", c_get_xy, 0);
+	rb_define_method (c, "set_xy", c_set_xy, 4);
 }