We now use real structs to wrap objects.

[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 274230e4cb01bfcf8ac9500071e7b8b8dafa744d..c143ea7bcf68dee77f2a101c3c1246ae0508f88a 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 40 2004-07-25 13:14:34Z tilman $
+ * $Id: rb_gl_x11.c 50 2004-08-01 10:18:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,15 +26,20 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
+static void c_free (RbEcoreEvas *ee)
+{
+       c_ecore_evas_free (ee, true);
+}
+
 static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 {
        VALUE self, disp, parent, geom[4];
-       Ecore_Evas **ee = NULL;
+       RbEcoreEvas *ee = NULL;
        char *cdisp = NULL;
        int i, igeom[4] = {0, 0, 0, 0};
 
-       self = Data_Make_Struct (klass, Ecore_Evas *,
-                                NULL, c_ecore_evas_free, ee);
+       self = Data_Make_Struct (klass, RbEcoreEvas,
+                                c_ecore_evas_mark, c_free, ee);
 
        rb_scan_args (argc, argv, "06", &disp, &parent,
                      &geom[0], &geom[1], &geom[2], &geom[3]);
@@ -47,15 +52,15 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
        for (i = 0; i < 4; i++)
                if (!NIL_P (geom[i])) {
                        Check_Type (geom[i], T_FIXNUM);
-                       igeom[i] = NUM2INT (geom[i]);
+                       igeom[i] = FIX2INT (geom[i]);
                }
 
        ecore_init ();
        ecore_evas_init ();
 
-       *ee = ecore_evas_gl_x11_new (cdisp, 0,
-                                    igeom[0], igeom[1],
-                                    igeom[2], igeom[3]);
+       ee->real = ecore_evas_gl_x11_new (cdisp, 0,
+                                         igeom[0], igeom[1],
+                                         igeom[2], igeom[3]);
 
        rb_obj_call_init (self, 0, NULL);