X-Git-Url: http://git.code-monkey.de/?p=ruby-evas.git;a=blobdiff_plain;f=src%2Frb_evas.c;h=4eb21344ed2380422c45cdc4303af3e905d79b15;hp=96d26de1713dbd0196f9e3f73f4e97ab8252f075;hb=c3202d026f3800676461ee407f2a5e46dc20e2f2;hpb=2f0ae317e2b3304fcc62c534ae3e1e69d3268f41 diff --git a/src/rb_evas.c b/src/rb_evas.c index 96d26de..4eb2134 100644 --- a/src/rb_evas.c +++ b/src/rb_evas.c @@ -1,6 +1,4 @@ /* - * $Id: rb_evas.c 283 2005-03-15 17:59:03Z tilman $ - * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * * This library is free software; you can redistribute it and/or @@ -34,21 +32,27 @@ static void c_mark (RbEvas *e) 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; - RbEvas *evas = NULL; 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; - rb_obj_call_init (self, 0, NULL); - return self; } @@ -92,8 +96,6 @@ static VALUE c_font_path_append (VALUE self, VALUE path) { GET_OBJ (self, RbEvas, e); - Check_Type (path, T_STRING); - evas_font_path_append (e->real, StringValuePtr (path)); return Qnil; @@ -109,9 +111,7 @@ static VALUE c_font_path_prepend (VALUE self, VALUE path) { GET_OBJ (self, RbEvas, e); - Check_Type (path, T_STRING); - - evas_font_path_append (e->real, StringValuePtr (path)); + evas_font_path_prepend (e->real, StringValuePtr (path)); return Qnil; } @@ -292,8 +292,6 @@ static VALUE c_find_object (VALUE self, VALUE name) GET_OBJ (self, RbEvas, e); - Check_Type (name, T_STRING); - if (!(o = evas_object_name_find (e->real, StringValuePtr (name)))) return Qnil; @@ -329,6 +327,8 @@ void Init_Evas (void) { 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);