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

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-07-06 14:21:03 +02:00
commit d43482ec9b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/display/get_x11.h
View File

@ -52,7 +52,6 @@ struct XVisualInfo;
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Intrinsic.h>
#ifdef HAVE_XRANDR #ifdef HAVE_XRANDR
#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrandr.h>

2
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -1182,7 +1182,7 @@ set_wm_properties(const WindowProperties &properties, bool already_mapped) {
nassertv(next_set_data < max_set_data); nassertv(next_set_data < max_set_data);
// Add the process ID as a convenience for other applications. // Add the process ID as a convenience for other applications.
Cardinal pid = getpid(); PN_int32 pid = getpid();
XChangeProperty(_display, _xwindow, x11_pipe->_net_wm_pid, XChangeProperty(_display, _xwindow, x11_pipe->_net_wm_pid,
XA_CARDINAL, 32, PropModeReplace, XA_CARDINAL, 32, PropModeReplace,
(unsigned char *)&pid, 1); (unsigned char *)&pid, 1);