projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the build with the latest Ecore snapshot.
[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 6e9263cd994de1e0186744059448cf0e859c00ab..84c09e2e284748341e4440509abfaac4f6fe73cd 100644
(file)
--- a/
src/ecore_evas/rb_gl_x11.c
+++ b/
src/ecore_evas/rb_gl_x11.c
@@
-1,6
+1,4
@@
/*
/*
- * $Id: rb_gl_x11.c 100 2004-08-27 09:31:26Z tilman $
- *
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
@@
-52,22
+50,31
@@
static void c_free (RbEcoreEvasGlX11 *ee)
free (ee);
}
free (ee);
}
+static VALUE c_alloc (VALUE klass)
+{
+ RbEcoreEvasGlX11 *ee = NULL;
+
+ ecore_init ();
+ ecore_evas_init ();
+
+ return Data_Make_Struct (klass, RbEcoreEvasGlX11,
+ c_mark, c_free, ee);
+}
+
/*
* call-seq:
* Ecore::Evas::GlX11.new([display, parent, x, y, w, h]) => glx11
*
* Creates an Ecore::Evas::GlX11 object.
*/
/*
* 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
)
+static VALUE c_
init (int argc, VALUE *argv, VALUE self
)
{
{
- VALUE self, disp, parent, geom[4];
- RbEcoreEvasGlX11 *ee = NULL;
+ VALUE disp, parent, geom[4];
RbWindow *win = NULL;
char *cdisp = NULL;
int i, igeom[4] = {0, 0, 0, 0};
RbWindow *win = NULL;
char *cdisp = NULL;
int i, igeom[4] = {0, 0, 0, 0};
- self = Data_Make_Struct (klass, RbEcoreEvasGlX11,
- c_mark, c_free, ee);
+ GET_OBJ (self, RbEcoreEvasGlX11, 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]);
@@
-88,9
+95,6
@@
static VALUE c_new (int argc, VALUE *argv, VALUE klass)
igeom[i] = FIX2INT (geom[i]);
}
igeom[i] = FIX2INT (geom[i]);
}
- ecore_init ();
- ecore_evas_init ();
-
ee->ee.real = ecore_evas_gl_x11_new (cdisp,
win ? win->real : 0,
igeom[0], igeom[1],
ee->ee.real = ecore_evas_gl_x11_new (cdisp,
win ? win->real : 0,
igeom[0], igeom[1],
@@
-98,7
+102,7
@@
static VALUE c_new (int argc, VALUE *argv, VALUE klass)
ee->parent_window = parent;
ee->window = Qnil;
ee->parent_window = parent;
ee->window = Qnil;
- rb_
obj_call_init (self, 0, NULL
);
+ rb_
call_super (argc, argv
);
return self;
}
return self;
}
@@
-127,10
+131,9
@@
void Init_GlX11 (void)
{
VALUE c;
{
VALUE c;
- rb_require ("ecore_x");
-
c = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
c = rb_define_class_under (mEvas, "GlX11", 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);
}
rb_define_method (c, "window", c_window_get, 0);
}