X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54ffa10747e51b9fa8c52b7f864e187e82fd4919..cb1c59659496ca58ddae59a1e197fd5b1afe375b:/src/os2/app.cpp?ds=sidebyside

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index a2608efbf2..8062159328 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -896,9 +896,14 @@ bool wxApp::ProcessMessage(
 #endif // wxUSE_TOOLTIPS
 
     //
-    // We must relay Timer events to wxTimer's processing function
+    // Pass non-system timer messages to the wxTimerProc
     //
-    if (pMsg->msg == WM_TIMER)
+    if (pMsg->msg == WM_TIMER &&
+        (SHORT1FROMMP(pMsg->mp1) != TID_CURSOR &&
+         SHORT1FROMMP(pMsg->mp1) != TID_FLASHWINDOW &&
+         SHORT1FROMMP(pMsg->mp1) != TID_SCROLL &&
+         SHORT1FROMMP(pMsg->mp1) != 0x0000
+        ))
         wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
 
     //