projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't try to convert NULL into a String.
[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..e3ceb30fb238198d59033c13588e37405b91bd0d 100644
(file)
--- a/
src/ecore_evas/rb_gl_x11.c
+++ b/
src/ecore_evas/rb_gl_x11.c
@@
-1,7
+1,7
@@
/*
/*
- * $Id: rb_gl_x11.c
40 2004-07-25 13:14:34
Z tilman $
+ * $Id: rb_gl_x11.c
77 2004-08-19 17:39:29
Z tilman $
*
*
- * Copyright (C) 2004
Tilman Sauerbeck (tilman at code-monkey de
)
+ * Copyright (C) 2004
ruby-ecore team (see AUTHORS
)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-26,15
+26,26
@@
#include "rb_ecore_evas_main.h"
#include "rb_ecore_evas.h"
#include "rb_ecore_evas_main.h"
#include "rb_ecore_evas.h"
+static void c_free (RbEcoreEvas *ee)
+{
+ c_ecore_evas_free (ee, true);
+}
+
+/*
+ * call-seq:
+ * Ecore::Evas::GlX11.new([display, parent, x, y, w, h]) => glx11
+ *
+ * Creates an Ecore::Evas::GlX11 object.
+ */
static VALUE c_new (int argc, VALUE *argv, VALUE klass)
{
VALUE self, disp, parent, geom[4];
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};
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]);
rb_scan_args (argc, argv, "06", &disp, &parent,
&geom[0], &geom[1], &geom[2], &geom[3]);
@@
-47,15
+58,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);
for (i = 0; i < 4; i++)
if (!NIL_P (geom[i])) {
Check_Type (geom[i], T_FIXNUM);
- igeom[i] =
NUM
2INT (geom[i]);
+ igeom[i] =
FIX
2INT (geom[i]);
}
ecore_init ();
ecore_evas_init ();
}
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);
rb_obj_call_init (self, 0, NULL);