X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore_evas%2Frb_software_x11.c;h=e8c38338ffac1ac44dbdbd3356df523b74d0847d;hp=9aafa26a9cf6751d469dfbc3a5026f95e35cd5b4;hb=5c851d60ccd05df625b6ccaf4a425339912a1da3;hpb=85ffbde47626b42d8259b40907c3673d141ccb57

diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index 9aafa26..e8c3833 100644
--- a/src/ecore_evas/rb_software_x11.c
+++ b/src/ecore_evas/rb_software_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_software_x11.c 100 2004-08-27 09:31:26Z tilman $
+ * $Id: rb_software_x11.c 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -52,22 +52,31 @@ static void c_free (RbEcoreEvasSoftwareX11 *ee)
 	free (ee);
 }
 
+static VALUE c_alloc (VALUE klass)
+{
+	RbEcoreEvasSoftwareX11 *ee = NULL;
+
+	ecore_init ();
+	ecore_evas_init ();
+
+	return Data_Make_Struct (klass, RbEcoreEvasSoftwareX11,
+	                         c_mark, c_free, ee);
+}
+
 /*
  * call-seq:
  *  Ecore::Evas::SoftwareX11.new([display, parent, x, y, w, h]) => swx11
  *
  * Creates an Ecore::Evas::SoftwareX11 object.
  */
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+static VALUE c_init (int argc, VALUE *argv, VALUE self)
 {
-	VALUE self, disp, parent, geom[4];
-	RbEcoreEvasSoftwareX11 *ee = NULL;
+	VALUE disp, parent, geom[4];
 	RbWindow *win = NULL;
 	char *cdisp = NULL;
 	int i, igeom[4] = {0, 0, 0, 0};
 
-	self = Data_Make_Struct (klass, RbEcoreEvasSoftwareX11,
-	                         c_mark, c_free, ee);
+	GET_OBJ (self, RbEcoreEvasSoftwareX11, ee);
 
 	rb_scan_args (argc, argv, "06", &disp, &parent,
 	              &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -88,9 +97,6 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 			igeom[i] = FIX2INT (geom[i]);
 		}
 
-	ecore_init ();
-	ecore_evas_init ();
-
 	ee->ee.real = ecore_evas_software_x11_new (cdisp,
 	                                           win ? win->real : 0,
 	                                           igeom[0], igeom[1],
@@ -98,7 +104,7 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 	ee->parent_window = parent;
 	ee->window = Qnil;
 
-	rb_obj_call_init (self, 0, NULL);
+	rb_call_super (argc, argv);
 
 	return self;
 }
@@ -127,10 +133,9 @@ void Init_SoftwareX11 (void)
 {
 	VALUE c;
 
-	rb_require ("ecore_x");
-
 	c = rb_define_class_under (mEvas, "SoftwareX11", cEcoreEvas);
 
-	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, "window", c_window_get, 0);
 }