diff options
Diffstat (limited to 'xorg-server/hw/xwin/winwin32rootlesswindow.c')
-rw-r--r-- | xorg-server/hw/xwin/winwin32rootlesswindow.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/xorg-server/hw/xwin/winwin32rootlesswindow.c b/xorg-server/hw/xwin/winwin32rootlesswindow.c index f2d68cb46..e76da2dd9 100644 --- a/xorg-server/hw/xwin/winwin32rootlesswindow.c +++ b/xorg-server/hw/xwin/winwin32rootlesswindow.c @@ -195,22 +195,17 @@ winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv, /* Get current window placement */ GetWindowPlacement(pRLWinPriv->hWnd, &wndPlace); +#ifdef XWIN_MULTIWINDOWINTWM if (winIsInternalWMRunning(pScreenInfo)) { if (!pRLWinPriv->pFrame->win->overrideRedirect) fDecorate = TRUE; } -#if 0 - if (wndPlace.showCmd == SW_HIDE) - return; //showCmd = SWP_HIDEWINDOW; - else - showCmd = SWP_SHOWWINDOW; -#else +#endif if (wndPlace.showCmd == SW_HIDE) return; if (IsWindowVisible(pRLWinPriv->hWnd)) showCmd = SWP_SHOWWINDOW; -#endif showCmd |= SWP_NOMOVE | SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER; @@ -346,6 +341,7 @@ winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv, } } +#ifdef XWIN_MULTIWINDOWINTWM /* * winIsInternalWMRunning (winScreenInfoPtr pScreenInfo) */ @@ -354,7 +350,7 @@ winIsInternalWMRunning(winScreenInfoPtr pScreenInfo) { return pScreenInfo->fInternalWM && !pScreenInfo->fAnotherWMRunning; } - +#endif /* * winMWExtWMRestackWindows */ |