diff options
author | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
commit | 9dbe22229a8031aa2f6d922896e1b6539441b7b5 (patch) | |
tree | bd567f1d98f9431b4963dc3d0b05aea8ac78a1b6 /xorg-server/miext/rootless/rootlessCommon.h | |
parent | 07d4e6e86e3167bed18d2af81a56f3d9352d2541 (diff) | |
parent | 7687adcc34c9fc43d526f30b1cf2039b0af48841 (diff) | |
download | vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.gz vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.bz2 vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/miext/rootless/rootlessCommon.h')
-rw-r--r-- | xorg-server/miext/rootless/rootlessCommon.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/miext/rootless/rootlessCommon.h b/xorg-server/miext/rootless/rootlessCommon.h index ba121c0f4..d4a94f8ca 100644 --- a/xorg-server/miext/rootless/rootlessCommon.h +++ b/xorg-server/miext/rootless/rootlessCommon.h @@ -268,9 +268,6 @@ Bool RootlessResolveColormap (ScreenPtr pScreen, int first_color, void RootlessFlushWindowColormap (WindowPtr pWin); void RootlessFlushScreenColormaps (ScreenPtr pScreen); -// xp_error -int RootlessColormapCallback(void *data, int first_color, int n_colors, uint32_t *colors); - // Move a window to its proper location on the screen. void RootlessRepositionWindow(WindowPtr pWin); @@ -285,5 +282,6 @@ void RootlessUpdateRooted (Bool state); void RootlessEnableRoot (ScreenPtr pScreen); void RootlessDisableRoot (ScreenPtr pScreen); +void RootlessSetPixmapOfAncestors(WindowPtr pWin); #endif /* _ROOTLESSCOMMON_H */ |