projects
/
ruby-evas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code cleanup.
[ruby-evas.git]
/
src
/
rb_evas.c
diff --git
a/src/rb_evas.c
b/src/rb_evas.c
index 96d26de1713dbd0196f9e3f73f4e97ab8252f075..ff76dba1f7b3c8bf02b179972f6914d7ba51b0c9 100644
(file)
--- a/
src/rb_evas.c
+++ b/
src/rb_evas.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_evas.c
283 2005-03-15 17:59:03
Z tilman $
+ * $Id: rb_evas.c
382 2006-05-25 09:20:31
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-34,21
+34,27
@@
static void c_mark (RbEvas *e)
rb_gc_mark (e->parent);
}
rb_gc_mark (e->parent);
}
+static VALUE c_alloc (VALUE klass)
+{
+ RbEvas *evas = NULL;
+
+ return Data_Make_Struct (cEvas, RbEvas, c_mark, free, evas);
+}
+
VALUE TO_EVAS (VALUE parent, Evas *e)
{
VALUE self;
VALUE TO_EVAS (VALUE parent, Evas *e)
{
VALUE self;
- RbEvas *evas = NULL;
if (NIL_P (parent) || !e)
return Qnil;
if (NIL_P (parent) || !e)
return Qnil;
- self = Data_Make_Struct (cEvas, RbEvas,
- c_mark, free, evas);
+ self = rb_class_new_instance (0, NULL, cEvas);
+
+ GET_OBJ (self, RbEvas, evas);
+
evas->real = e;
evas->parent = parent;
evas->real = e;
evas->parent = parent;
- rb_obj_call_init (self, 0, NULL);
-
return self;
}
return self;
}
@@
-92,8
+98,6
@@
static VALUE c_font_path_append (VALUE self, VALUE path)
{
GET_OBJ (self, RbEvas, e);
{
GET_OBJ (self, RbEvas, e);
- Check_Type (path, T_STRING);
-
evas_font_path_append (e->real, StringValuePtr (path));
return Qnil;
evas_font_path_append (e->real, StringValuePtr (path));
return Qnil;
@@
-109,8
+113,6
@@
static VALUE c_font_path_prepend (VALUE self, VALUE path)
{
GET_OBJ (self, RbEvas, e);
{
GET_OBJ (self, RbEvas, e);
- Check_Type (path, T_STRING);
-
evas_font_path_append (e->real, StringValuePtr (path));
return Qnil;
evas_font_path_append (e->real, StringValuePtr (path));
return Qnil;
@@
-292,8
+294,6
@@
static VALUE c_find_object (VALUE self, VALUE name)
GET_OBJ (self, RbEvas, e);
GET_OBJ (self, RbEvas, e);
- Check_Type (name, T_STRING);
-
if (!(o = evas_object_name_find (e->real, StringValuePtr (name))))
return Qnil;
if (!(o = evas_object_name_find (e->real, StringValuePtr (name))))
return Qnil;
@@
-329,6
+329,8
@@
void Init_Evas (void)
{
cEvas = rb_define_class_under (mEvas, "Evas", rb_cObject);
{
cEvas = rb_define_class_under (mEvas, "Evas", rb_cObject);
+ rb_define_alloc_func (cEvas, c_alloc);
+
/* not publically instantiable yet */
rb_define_private_method (rb_singleton_class (cEvas),
"new", NULL, 0);
/* not publically instantiable yet */
rb_define_private_method (rb_singleton_class (cEvas),
"new", NULL, 0);