TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support for setParentWindow

Browse Source
This commit is contained in:
rdb 2008-08-26 07:48:27 +00:00
parent 77cfda8691
commit 09d15ccbcc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/glxdisplay/glxGraphicsWindow.cxx
View File

@ -647,9 +647,14 @@ open_window() {
if (!_properties.has_size()) { if (!_properties.has_size()) {
_properties.set_size(100, 100); _properties.set_size(100, 100);
} }
Window root_window = glx_pipe->get_root(); Window root_window;
if (!_properties.has_parent_window()) {
root_window = glx_pipe->get_root();
} else {
root_window = (Window) (int) _properties.get_parent_window();
}
#ifdef HAVE_GLXFBCONFIG #ifdef HAVE_GLXFBCONFIG
if (glxgsg->_fbconfig != None) { if (glxgsg->_fbconfig != None) {
setup_colormap(glxgsg->_fbconfig); setup_colormap(glxgsg->_fbconfig);