ecore_init and ecore_shutdown aren't exported anymore.

[ruby-ecore.git] / src / ecore_evas / rb_gl_x11.c

diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index 061517afb8df7e704dfbc84753f27d0f1e780299..de65a7313ff8884eab6c36ef54da730bb28b7e3f 100644 (file)
--- a/src/ecore_evas/rb_gl_x11.c
+++ b/src/ecore_evas/rb_gl_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_gl_x11.c 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_gl_x11.c 27 2004-07-08 18:25:05Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -20,19 +20,21 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Evas.h>
 
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
+static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 {
-       VALUE disp, parent, geom[4];
+       VALUE self, disp, parent, geom[4];
        Ecore_Evas **ee = NULL;
        char *cdisp = NULL;
        int i, igeom[4] = {0, 0, 0, 0};
 
-       Data_Get_Struct (self, Ecore_Evas *, ee);
+       self = Data_Make_Struct (klass, Ecore_Evas *,
+                                NULL, c_ecore_evas_free, ee);
 
        rb_scan_args (argc, argv, "06", &disp, &parent,
                      &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -48,22 +50,14 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
                        igeom[i] = NUM2INT (geom[i]);
                }
 
+       ecore_init ();
+       ecore_evas_init ();
+
        *ee = ecore_evas_gl_x11_new (cdisp, 0,
                                     igeom[0], igeom[1],
                                     igeom[2], igeom[3]);
 
-       return self;
-}
-
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
-{
-       VALUE self;
-       Ecore_Evas **ee;
-
-       self = Data_Make_Struct (klass, Ecore_Evas *,
-                                NULL, c_ecore_evas_free, ee);
-
-       rb_obj_call_init (self, argc, argv);
+       rb_obj_call_init (self, 0, NULL);
 
        return self;
 }
@@ -73,6 +67,4 @@ void Init_GlX11 (void)
        VALUE cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
 
        rb_define_singleton_method (cGlX11, "new", c_new, -1);
-       rb_define_method (cGlX11, "initialize", c_init, -1);
 }
-