diff options
Diffstat (limited to 'xorg-server/hw/xwin/winwin32rootlesswindow.c')
-rw-r--r-- | xorg-server/hw/xwin/winwin32rootlesswindow.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/xorg-server/hw/xwin/winwin32rootlesswindow.c b/xorg-server/hw/xwin/winwin32rootlesswindow.c index fbff83888..bcfb2798e 100644 --- a/xorg-server/hw/xwin/winwin32rootlesswindow.c +++ b/xorg-server/hw/xwin/winwin32rootlesswindow.c @@ -231,23 +231,18 @@ 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; @@ -389,7 +384,7 @@ winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv, } } - +#ifdef XWIN_MULTIWINDOWINTWM /* * winIsInternalWMRunning (winScreenInfoPtr pScreenInfo) */ @@ -398,7 +393,7 @@ winIsInternalWMRunning (winScreenInfoPtr pScreenInfo) { return pScreenInfo->fInternalWM && !pScreenInfo->fAnotherWMRunning; } - +#endif /* * winMWExtWMRestackWindows |