merge latest (4.3.99.16) from XFree86 (vendor) branch
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
*
|
||||
* Authors: Harold L Hunt II
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.6 2003/02/12 15:01:38 alanh Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.7 2003/07/29 21:25:16 dawes Exp $ */
|
||||
|
||||
#include "win.h"
|
||||
|
||||
@@ -68,9 +68,13 @@ winBlockHandler_ProcessMessages:
|
||||
/* Process all messages on our queue */
|
||||
while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
|
||||
{
|
||||
if (g_hDlgDepthChange == 0 || !IsDialogMessage (g_hDlgDepthChange, &msg))
|
||||
if ((g_hDlgDepthChange == 0
|
||||
|| !IsDialogMessage (g_hDlgDepthChange, &msg))
|
||||
&& (g_hDlgExit == 0
|
||||
|| !IsDialogMessage (g_hDlgExit, &msg)))
|
||||
{
|
||||
DispatchMessage (&msg);
|
||||
}
|
||||
}
|
||||
winReorderWindowsMultiWindow ((ScreenPtr)pBlockData);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user