diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-07-27 07:57:27 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-07-27 07:57:27 +0000 |
| commit | d4a0bed4b91da9de86c311c7fef9a8aa9a6f500c (patch) | |
| tree | a1b439049dee87bc951e190db93f5bbe8b43b0b5 /xserver/hw/xwin/windialogs.c | |
| parent | b6bc775539a31f663f9e22ce3ccaf0aa96adf3b6 (diff) | |
Update to xserver 1.20.5. Tested by jsg@
Diffstat (limited to 'xserver/hw/xwin/windialogs.c')
| -rw-r--r-- | xserver/hw/xwin/windialogs.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xserver/hw/xwin/windialogs.c b/xserver/hw/xwin/windialogs.c index c83b49bab..26b2ebd2c 100644 --- a/xserver/hw/xwin/windialogs.c +++ b/xserver/hw/xwin/windialogs.c @@ -201,18 +201,14 @@ winInitDialog(HWND hwndDlg) 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED); } -#ifdef XWIN_MULTIWINDOW if (g_hIconX) hIcon = g_hIconX; else -#endif hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_XWIN)); -#ifdef XWIN_MULTIWINDOW if (g_hSmallIconX) hIconSmall = g_hSmallIconX; else -#endif hIconSmall = LoadImage(g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), @@ -236,15 +232,11 @@ winDisplayExitDialog(winPrivScreenPtr pScreenPriv) for (i = 1; i < currentMaxClients; i++) if (clients[i] != NullClient) liveClients++; -#if defined(XWIN_MULTIWINDOW) /* Count down server internal clients */ if (pScreenPriv->pScreenInfo->fMultiWindow) liveClients -= 2; /* multiwindow window manager & XMsgProc */ -#endif -#if defined(XWIN_CLIPBOARD) if (g_fClipboardStarted) liveClients--; /* clipboard manager */ -#endif /* A user reported that this sometimes drops below zero. just eye-candy. */ if (liveClients < 0) |