projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops, don't put extra quotation marks in the class names.
[ruby-ecore.git]
/
src
/
ecore_evas
/
rb_software_x11.c
diff --git
a/src/ecore_evas/rb_software_x11.c
b/src/ecore_evas/rb_software_x11.c
index 0b480196acd4c2be46fadbb5f75b868fe0f83e75..83504dd94dab27e3ea75f1024bb68bba86841a03 100644
(file)
--- a/
src/ecore_evas/rb_software_x11.c
+++ b/
src/ecore_evas/rb_software_x11.c
@@
-1,7
+1,7
@@
/*
/*
- * $Id: rb_software_x11.c
60 2004-08-10 14:12:36
Z tilman $
+ * $Id: rb_software_x11.c
82 2004-08-21 09:45:08
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
@@
-31,6
+31,7
@@
typedef struct {
RbEcoreEvas ee;
typedef struct {
RbEcoreEvas ee;
+ VALUE parent_window;
VALUE window;
} RbEcoreEvasSoftwareX11;
VALUE window;
} RbEcoreEvasSoftwareX11;
@@
-38,6
+39,9
@@
static void c_mark (RbEcoreEvasSoftwareX11 *ee)
{
c_ecore_evas_mark (&ee->ee);
{
c_ecore_evas_mark (&ee->ee);
+ if (!NIL_P (ee->parent_window))
+ rb_gc_mark (ee->parent_window);
+
if (!NIL_P (ee->window))
rb_gc_mark (ee->window);
}
if (!NIL_P (ee->window))
rb_gc_mark (ee->window);
}
@@
-59,6
+63,7
@@
static VALUE c_new (int argc, VALUE *argv, VALUE klass)
{
VALUE self, disp, parent, geom[4];
RbEcoreEvasSoftwareX11 *ee = NULL;
{
VALUE self, disp, parent, geom[4];
RbEcoreEvasSoftwareX11 *ee = NULL;
+ RbWindow *win = NULL;
char *cdisp = NULL;
int i, igeom[4] = {0, 0, 0, 0};
char *cdisp = NULL;
int i, igeom[4] = {0, 0, 0, 0};
@@
-73,6
+78,11
@@
static VALUE c_new (int argc, VALUE *argv, VALUE klass)
cdisp = StringValuePtr (disp);
}
cdisp = StringValuePtr (disp);
}
+ if (!NIL_P (parent)) {
+ CHECK_CLASS (parent, cWindow);
+ Data_Get_Struct (parent, RbWindow, win);
+ }
+
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);
@@
-82,9
+92,11
@@
static VALUE c_new (int argc, VALUE *argv, VALUE klass)
ecore_init ();
ecore_evas_init ();
ecore_init ();
ecore_evas_init ();
- ee->ee.real = ecore_evas_software_x11_new (cdisp, 0,
+ ee->ee.real = ecore_evas_software_x11_new (cdisp,
+ win ? win->real : 0,
igeom[0], igeom[1],
igeom[2], igeom[3]);
igeom[0], igeom[1],
igeom[2], igeom[3]);
+ ee->parent_window = parent;
ee->window = Qnil;
rb_obj_call_init (self, 0, NULL);
ee->window = Qnil;
rb_obj_call_init (self, 0, NULL);