src/corelib/kernel/qeventdispatcher_win.cpp
changeset 33 3e2da88830cd
parent 30 5dc02b23752f
--- a/src/corelib/kernel/qeventdispatcher_win.cpp	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp	Wed Aug 18 10:37:55 2010 +0300
@@ -71,10 +71,12 @@
 #ifndef WM_TOUCH
 #  define WM_TOUCH 0x0240
 #endif
+#ifndef QT_NO_GESTURES
 #ifndef WM_GESTURE
 #  define WM_GESTURE 0x0119
 #  define WM_GESTURENOTIFY 0x011A
 #endif
+#endif // QT_NO_GESTURES
 
 enum {
     WM_QT_SOCKETNOTIFIER = WM_USER,
@@ -514,8 +516,12 @@
         if (q) {
             QEventDispatcherWin32Private *d = q->d_func();
             int localSerialNumber = d->serialNumber;
+#ifdef Q_OS_WINCE
+            MSG dummyMsg;
+            if (HIWORD(GetQueueStatus(QS_INPUT)) == 0
+                && PeekMessage(&dummyMsg, 0, WM_TIMER, WM_TIMER, PM_NOREMOVE) == 0
+#else
             if (HIWORD(GetQueueStatus(QS_INPUT | QS_RAWINPUT | QS_TIMER)) == 0
-#ifndef Q_OS_WINCE
                 || GetMessageTime() - d->lastMessageTime >= 10
 #endif
                 ) {
@@ -738,8 +744,10 @@
                         || msg.message == WM_MOUSEWHEEL
                         || msg.message == WM_MOUSEHWHEEL
                         || msg.message == WM_TOUCH
+#ifndef QT_NO_GESTURES
                         || msg.message == WM_GESTURE
                         || msg.message == WM_GESTURENOTIFY
+#endif
                         || msg.message == WM_CLOSE)) {
                     // queue user input events for later processing
                     haveMessage = false;