summaryrefslogtreecommitdiff
path: root/hw/xwin/winwakeup.c
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-06-21 13:19:32 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-06-21 13:19:32 +0000
commitd6e8b1affec7351549c0006cc63b6923091cdd68 (patch)
tree6e5e9dd1c1ec6e141349337df844b649bbf4277d /hw/xwin/winwakeup.c
parentdfdbb60bf5f613b3554d5435f08f16bde72aa353 (diff)
Bug 777: Merge from CYGWIN branch
Diffstat (limited to 'hw/xwin/winwakeup.c')
-rw-r--r--hw/xwin/winwakeup.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c
index 55658ecac..4553a4636 100644
--- a/hw/xwin/winwakeup.c
+++ b/hw/xwin/winwakeup.c
@@ -34,6 +34,16 @@
#include "win.h"
+
+/*
+ * References to external symbols
+ */
+
+extern HWND g_hDlgDepthChange;
+extern HWND g_hDlgExit;
+extern HWND g_hDlgAbout;
+
+
/* See Porting Layer Definition - p. 7 */
void
winWakeupHandler (int nScreen,
@@ -41,9 +51,7 @@ winWakeupHandler (int nScreen,
unsigned long ulResult,
pointer pReadmask)
{
-#if 0
winScreenPriv((ScreenPtr)pWakeupData);
-#endif
MSG msg;
/* Process all messages on our queue */
@@ -52,12 +60,11 @@ winWakeupHandler (int nScreen,
if ((g_hDlgDepthChange == 0
|| !IsDialogMessage (g_hDlgDepthChange, &msg))
&& (g_hDlgExit == 0
- || !IsDialogMessage (g_hDlgExit, &msg)))
+ || !IsDialogMessage (g_hDlgExit, &msg))
+ && (g_hDlgAbout == 0
+ || !IsDialogMessage (g_hDlgAbout, &msg)))
{
DispatchMessage (&msg);
}
}
- winReorderWindowsMultiWindow ((ScreenPtr)pWakeupData);
}
-
-