diff options
author | marha <marha@users.sourceforge.net> | 2010-09-30 15:43:57 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-09-30 15:43:57 +0000 |
commit | 54fffe7283b49dcaae81e826eb0dff213552c4ec (patch) | |
tree | c3a8c65ebffb5841251bd16edec93f0576f77418 /xorg-server/hw/xquartz/xpr/xprFrame.c | |
parent | d718b0dd8ed27c6f8497077b8d4b088d9b7f7bd3 (diff) | |
parent | f952d0d771de6d9b8ecc3cbbe3624203723bbb25 (diff) | |
download | vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.gz vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.bz2 vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/xpr/xprFrame.c')
-rw-r--r-- | xorg-server/hw/xquartz/xpr/xprFrame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c index 121f1de3d..fecae5a1b 100644 --- a/xorg-server/hw/xquartz/xpr/xprFrame.c +++ b/xorg-server/hw/xquartz/xpr/xprFrame.c @@ -171,7 +171,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen, pFrame->level = !IsRoot (pWin) ? AppleWMWindowLevelNormal : AppleWMNumWindowLevels;
- if(quartzEnableRootless)
+ if(XQuartzIsRootless)
wc.window_level = normal_window_levels[pFrame->level];
else
wc.window_level = rooted_window_levels[pFrame->level];
@@ -285,7 +285,7 @@ static void xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) { RootlessWindowRec *winRec = x_hash_table_lookup(window_hash, wid, NULL);
if(winRec) {
- if(quartzEnableRootless)
+ if(XQuartzIsRootless)
wc.window_level = normal_window_levels[winRec->level];
else
wc.window_level = rooted_window_levels[winRec->level];
|