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

set_parent_window(0) means NULL

Browse Source
This commit is contained in:
David Rose 2009-11-02 20:47:29 +00:00
parent c7e7cc8c1c
commit dc3668bf0e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/display/nativeWindowHandle.cxx
View File

@ -102,7 +102,7 @@ get_int_handle() const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void NativeWindowHandle::IntHandle:: void NativeWindowHandle::IntHandle::
output(ostream &out) const { output(ostream &out) const {
out << _handle; out << "(" << _handle << ")";
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -112,7 +112,7 @@ output(ostream &out) const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void NativeWindowHandle::SubprocessHandle:: void NativeWindowHandle::SubprocessHandle::
output(ostream &out) const { output(ostream &out) const {
out << _filename; out << "(" << _filename << ")";
} }
#if defined(HAVE_X11) && !defined(CPPPARSER) #if defined(HAVE_X11) && !defined(CPPPARSER)

4
panda/src/display/windowProperties.cxx
View File

@ -225,9 +225,13 @@ clear() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void WindowProperties:: void WindowProperties::
set_parent_window(size_t parent) { set_parent_window(size_t parent) {
if (parent == 0) {
set_parent_window((WindowHandle *)NULL);
} else {
PT(WindowHandle) handle = NativeWindowHandle::make_int(parent); PT(WindowHandle) handle = NativeWindowHandle::make_int(parent);
set_parent_window(handle); set_parent_window(handle);
} }
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: WindowProperties::add_properties // Function: WindowProperties::add_properties