Changeset 9792 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

Feb 13, 2003, 11:34:49 AM (23 years ago)

Author:

sandervl

Message:

Check if WM_KILLFOCUS was already sent by SetFocus(0) call

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (2 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.100 2003-02-13 10:12:25 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.101 2003-02-13 10:34:48 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -285 +285 @@
 
         if((ULONG)os2Msg->mp2 == TRUE) {
-                winMsg->message = WINWM_SETFOCUS;
-                winMsg->wParam  = (WPARAM)hwndFocus;
+            winMsg->message = WINWM_SETFOCUS;
+            winMsg->wParam  = (WPARAM)hwndFocus;
         }
         else {
+            //If SetFocus(0) was called, then the window has already received
+            //a WM_KILLFOCUS; don't send another one
+            if(!fIgnoreKeystrokes) {
                 winMsg->message = WINWM_KILLFOCUS;
                 winMsg->wParam  = (WPARAM)hwndFocus;
+            }
+            else {
+                dprintf(("Window has already received a WM_KILLFOCUS (SetFocus(0)); ignore"));
+                goto dummymessage;
+            }
         }
         break;