From f48bba2d3cf64903ab176f6f957589a0a9ffa660 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Fri, 10 Feb 2006 18:27:31 +0000 Subject: [PATCH] Class instantiation fixes. --- src/esmart_container/rb_esmart_container.c | 22 +++++++++++-------- src/esmart_draggies/rb_esmart_draggies.c | 21 ++++++------------ .../rb_esmart_file_dialog.c | 18 +++++++++------ src/esmart_trans_x11/rb_esmart_trans_x11.c | 20 +++++------------ 4 files changed, 36 insertions(+), 45 deletions(-) diff --git a/src/esmart_container/rb_esmart_container.c b/src/esmart_container/rb_esmart_container.c index 45e13f8..85b9fdc 100644 --- a/src/esmart_container/rb_esmart_container.c +++ b/src/esmart_container/rb_esmart_container.c @@ -1,5 +1,5 @@ /* - * $Id: rb_esmart_container.c 317 2005-04-25 21:48:10Z tilman $ + * $Id: rb_esmart_container.c 356 2006-02-10 18:27:31Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -45,20 +45,23 @@ static void c_free (RbContainer *e) free (e); } -static VALUE c_new (VALUE klass, VALUE evas) +static VALUE c_alloc (VALUE klass) { - VALUE self, argv[1]; - RbContainer *cont; + RbContainer *cont = NULL; + return Data_Make_Struct (klass, RbContainer, c_mark, + c_free, cont); +} + +static VALUE c_init (VALUE self, VALUE evas) +{ CHECK_CLASS (evas, cEvas); GET_OBJ (evas, RbEvas, e); + GET_OBJ (self, RbContainer, cont); - self = Data_Make_Struct (klass, RbContainer, c_mark, - c_free, cont); cont->real.real = esmart_container_new (e->real); - argv[0] = evas; - rb_obj_call_init (self, 1, argv); + rb_call_super (1, &evas); cont->elements = rb_ary_new (); @@ -280,7 +283,8 @@ void Init_esmart_container (void) c = rb_define_class_under (mEsmart, "Container", cEvasObject); - rb_define_singleton_method (c, "new", c_new, 1); + rb_define_alloc_func (c, c_alloc); + rb_define_method (c, "initialize", c_init, 1); rb_define_method (c, "direction", c_direction_get, 0); rb_define_method (c, "direction=", c_direction_set, 1); rb_define_method (c, "spacing", c_spacing_get, 0); diff --git a/src/esmart_draggies/rb_esmart_draggies.c b/src/esmart_draggies/rb_esmart_draggies.c index c422af5..e9eac00 100644 --- a/src/esmart_draggies/rb_esmart_draggies.c +++ b/src/esmart_draggies/rb_esmart_draggies.c @@ -1,5 +1,5 @@ /* - * $Id: rb_esmart_draggies.c 316 2005-04-24 20:07:36Z tilman $ + * $Id: rb_esmart_draggies.c 356 2006-02-10 18:27:31Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -32,29 +32,22 @@ static void on_mouse_up (void *data, Evas *e, Evas_Object *o, void *ev) ecore_evas_raise (data); } -static void c_free (RbEvasObject *e) +static VALUE c_init (VALUE self, VALUE ecore_evas) { - c_evas_object_free (e, true); -} - -static VALUE c_new (VALUE klass, VALUE ecore_evas) -{ - VALUE self, argv[1]; static ID evas; - RbEvasObject *draggies; + VALUE tmp; CHECK_CLASS (ecore_evas, cEcoreEvas); GET_OBJ (ecore_evas, RbEcoreEvas, ee); + GET_OBJ (self, RbEvasObject, draggies); - self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark, - c_free, draggies); draggies->real = esmart_draggies_new (ee->real); if (!evas) evas = rb_intern ("evas"); - argv[0] = rb_funcall (ecore_evas, evas, 0); - rb_obj_call_init (self, 1, argv); + tmp = rb_funcall (ecore_evas, evas, 0); + rb_call_super (1, &tmp); esmart_draggies_event_callback_add (draggies->real, EVAS_CALLBACK_MOUSE_UP, @@ -83,6 +76,6 @@ void Init_esmart_draggies (void) c = rb_define_class_under (mEsmart, "Draggies", cEvasObject); - rb_define_singleton_method (c, "new", c_new, 1); + rb_define_method (c, "initialize", c_init, 1); rb_define_method (c, "button=", c_button_set, 1); } diff --git a/src/esmart_file_dialog/rb_esmart_file_dialog.c b/src/esmart_file_dialog/rb_esmart_file_dialog.c index a45d3a4..4c60fec 100644 --- a/src/esmart_file_dialog/rb_esmart_file_dialog.c +++ b/src/esmart_file_dialog/rb_esmart_file_dialog.c @@ -1,5 +1,5 @@ /* - * $Id: rb_esmart_file_dialog.c 337 2005-05-02 17:48:20Z tilman $ + * $Id: rb_esmart_file_dialog.c 356 2006-02-10 18:27:31Z tilman $ * * Copyright (C) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -52,11 +52,15 @@ static void c_free (RbFileDialog *e) free (e); } -static VALUE c_new (VALUE klass, VALUE evas, VALUE edj) +static VALUE c_alloc (VALUE klass) { - VALUE self, argv[1]; RbFileDialog *fd = NULL; + return Data_Make_Struct (klass, RbFileDialog, c_mark, c_free, fd); +} + +static VALUE c_init (VALUE self, VALUE evas, VALUE edj) +{ if (!rb_block_given_p ()) { rb_raise (rb_eStandardError, "no block given"); return Qnil; @@ -65,16 +69,15 @@ static VALUE c_new (VALUE klass, VALUE evas, VALUE edj) CHECK_CLASS (evas, cEvas); StringValue (edj); GET_OBJ (evas, RbEvas, e); + GET_OBJ (self, RbFileDialog, fd); - self = Data_Make_Struct (klass, RbFileDialog, c_mark, c_free, fd); fd->real.real = esmart_file_dialog_new (e->real, StringValuePtr (edj)); if (!fd->real.real) rb_raise (rb_eStandardError, "failed"); - argv[0] = evas; - rb_obj_call_init (self, 1, argv); + rb_call_super (1, &evas); fd->callback = rb_block_proc (); fd->edje = Qnil; @@ -179,7 +182,8 @@ void Init_esmart_file_dialog (void) c = rb_define_class_under (mEsmart, "FileDialog", cEvasObject); - rb_define_singleton_method (c, "new", c_new, 2); + rb_define_alloc_func (c, c_alloc); + rb_define_method (c, "initialize", c_init, 2); rb_define_method (c, "edje", c_edje_get, 0); rb_define_method (c, "selections", c_selections_get, 0); rb_define_method (c, "current_directory", c_current_directory_get, 0); diff --git a/src/esmart_trans_x11/rb_esmart_trans_x11.c b/src/esmart_trans_x11/rb_esmart_trans_x11.c index 4671d62..a06f168 100644 --- a/src/esmart_trans_x11/rb_esmart_trans_x11.c +++ b/src/esmart_trans_x11/rb_esmart_trans_x11.c @@ -1,5 +1,5 @@ /* - * $Id: rb_esmart_trans_x11.c 52 2004-08-01 10:19:14Z tilman $ + * $Id: rb_esmart_trans_x11.c 356 2006-02-10 18:27:31Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -27,25 +27,15 @@ #include "../rb_esmart.h" -static void c_free (RbEvasObject *e) +static VALUE c_init (VALUE self, VALUE evas) { - c_evas_object_free (e, true); -} - -static VALUE c_new (VALUE klass, VALUE evas) -{ - VALUE self, argv[1]; - RbEvasObject *trans; - CHECK_CLASS (evas, cEvas); GET_OBJ (evas, RbEvas, e); + GET_OBJ (self, RbEvasObject, trans); - self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark, - c_free, trans); trans->real = esmart_trans_x11_new (e->real); - argv[0] = evas; - rb_obj_call_init (self, 1, argv); + rb_call_super (1, &evas); return self; } @@ -104,7 +94,7 @@ void Init_esmart_trans_x11 (void) c = rb_define_class_under (mEsmart, "TransX11", cEvasObject); - rb_define_singleton_method (c, "new", c_new, 1); + rb_define_method (c, "initialize", c_init, 1); rb_define_method (c, "type", c_type_get, 0); rb_define_method (c, "type=", c_type_set, 1); rb_define_method (c, "window=", c_window_set, 1); -- 2.30.2