projects
/
ruby-evas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Class instantiation fixes.
[ruby-evas.git]
/
src
/
rb_line.c
diff --git
a/src/rb_line.c
b/src/rb_line.c
index e75f2bc890a5f892c22f66a1f699cb60abb80325..8600d22625f7a689144541e13dc37ae18febc190 100644
(file)
--- a/
src/rb_line.c
+++ b/
src/rb_line.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_line.c
23 2004-06-26 22:55:31
Z tilman $
+ * $Id: rb_line.c
354 2006-02-10 18:14:08
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-26,26
+26,15
@@
#include "rb_evas.h"
#include "rb_evas_object.h"
#include "rb_evas.h"
#include "rb_evas_object.h"
-static VALUE c_
new (VALUE klass
, VALUE evas)
+static VALUE c_
init (VALUE self
, VALUE evas)
{
{
- VALUE self, argv[1];
- Evas_Object **rect;
+ CHECK_CLASS (evas, cEvas);
+ GET_OBJ (evas, RbEvas, e);
+ GET_OBJ (self, RbEvasObject, line);
- if (!rb_obj_is_kind_of (evas, cEvas)) {
- rb_raise (rb_eTypeError,
- "wrong argument type %s (expected Evas)",
- rb_obj_classname (evas));
- return Qnil;
- }
+ line->real = evas_object_line_add (e->real);
- GET_OBJ (evas, Evas, e, "Evas");
-
- self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
- c_evas_object_free, rect);
- *rect = evas_object_line_add (*e);
-
- argv[0] = evas;
- rb_obj_call_init (self, 1, argv);
+ rb_call_super (1, &evas);
return self;
}
return self;
}
@@
-54,9
+43,9
@@
static VALUE c_get_xy (VALUE self)
{
int coord[4] = {0, 0, 0, 0};
{
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]),
&coord[2], &coord[3]);
return rb_ary_new3 (4, INT2FIX (coord[0]), INT2FIX (coord[1]),
@@
-66,14
+55,14
@@
static VALUE c_get_xy (VALUE self)
static VALUE c_set_xy (VALUE self, VALUE x1, VALUE y1,
VALUE x2, VALUE y2)
{
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);
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;
FIX2INT (x2), FIX2INT (y2));
return Qnil;
@@
-81,9
+70,9
@@
static VALUE c_set_xy (VALUE self, VALUE x1, VALUE y1,
void Init_Line (void)
{
void Init_Line (void)
{
- VALUE c
Line
= 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 (c
Line
, "get_xy", c_get_xy, 0);
- rb_define_method (c
Line
, "set_xy", c_set_xy, 4);
+ rb_define_
method (c, "initialize", c_init
, 1);
+ rb_define_method (c, "get_xy", c_get_xy, 0);
+ rb_define_method (c, "set_xy", c_set_xy, 4);
}
}