From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Fri, 10 Feb 2006 18:15:13 +0000 (+0000)
Subject: Class instantiation fixes.
X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=commitdiff_plain;h=648d13edc9e6dd10cb68cfa88d8c6b2658a9b2c7

Class instantiation fixes.
---

diff --git a/src/rb_edje.c b/src/rb_edje.c
index c46b315..0e32b83 100644
--- a/src/rb_edje.c
+++ b/src/rb_edje.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_edje.c 335 2005-05-02 17:28:37Z tilman $
+ * $Id: rb_edje.c 355 2006-02-10 18:15:13Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -55,51 +55,49 @@ static void c_free (RbEdje *e)
 	edje_shutdown ();
 }
 
+static VALUE c_alloc (VALUE klass)
+{
+	RbEdje *e = NULL;
+
+	edje_init ();
+
+	return Data_Make_Struct (klass, RbEdje, c_mark, c_free, e);
+}
+
 /*
  * call-seq:
  *  Edje::Edje.new(evas) => edje
  *
  * Creates an Edje::Edje object.
  */
-static VALUE c_new (VALUE klass, VALUE evas)
+static VALUE c_init (VALUE self, VALUE evas)
 {
-	VALUE self, argv[1];
-	RbEdje *edje = NULL;
-
 	CHECK_CLASS (evas, cEvas);
 	GET_OBJ (evas, RbEvas, e);
+	GET_OBJ (self, RbEdje, edje);
 
-	edje_init ();
-
-	self = Data_Make_Struct (klass, RbEdje, c_mark, c_free, edje);
+	/* c_new_from_pointer() might already have initialized the pointer */
+	if (!edje->real.real)
+		edje->real.real = edje_object_add (e->real);
 
-	edje->real.real = edje_object_add (e->real);
 	edje->parts = Qnil;
 	edje->callbacks = Qnil;
 	edje->on_text_changed_cb = Qnil;
 
-	argv[0] = evas;
-	rb_obj_call_init (self, 1, argv);
+	rb_call_super (1, &evas);
 
 	return self;
 }
 
 static VALUE c_new_from_pointer (VALUE klass, VALUE evas, VALUE ptr)
 {
-	VALUE self, argv[1];
-	RbEdje *edje = NULL;
-
-	edje_init ();
+	VALUE self = rb_obj_alloc (klass);
 
-	self = Data_Make_Struct (klass, RbEdje, c_mark, c_free, edje);
+	GET_OBJ (self, RbEdje, edje);
 
 	edje->real.real = (Evas_Object *) ptr;
-	edje->parts = Qnil;
-	edje->callbacks = Qnil;
-	edje->on_text_changed_cb = Qnil;
 
-	argv[0] = evas;
-	rb_obj_call_init (self, 1, argv);
+	rb_obj_call_init (self, 1, &evas);
 
 	return self;
 }
@@ -680,9 +678,10 @@ void Init_Edje (void)
 {
 	cEdje = rb_define_class_under (mEdje, "Edje", cEvasObject);
 
-	rb_define_singleton_method (cEdje, "new", c_new, 1);
+	rb_define_alloc_func (cEdje, c_alloc);
 	rb_define_singleton_method (cEdje, "new_from_pointer",
 	                            c_new_from_pointer, 2);
+	rb_define_method (cEdje, "initialize", c_init, 1);
 	rb_define_method (cEdje, "freeze", c_freeze, 0);
 	rb_define_method (cEdje, "thaw", c_thaw, 0);
 	rb_define_method (cEdje, "load", c_load, 2);