Changeset 9792 for trunk/src/user32/pmwindow.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/pmwindow.cpp (modified) (7 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.198 2003-02-12 09:39:44 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.199 2003-02-13 10:34:49 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -54 +54 @@
 #include "dragdrop.h"
 #include "menu.h"
+#include "user32api.h"
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -257 +258 @@
 } /* End of main */
 //******************************************************************************
-#ifdef NEW_WGSS
 HBITMAP OPEN32API _O32_CreateBitmapFromPMHandle(HBITMAP hPMBitmap);
 
@@ -270 +270 @@
     return yyrc;
 }
-#endif
 //******************************************************************************
 static void QueryPMMenuBitmaps()
@@ -300 +299 @@
         hbmFrameMenu[PMMENU_CLOSEBUTTONDOWN] = GpiLoadBitmap(hdc, hModDisplay, SBMP_CLOSEDEP, 0, 0);
 
-#ifdef NEW_WGSS
         //Create win32 bitmap handles of the OS/2 min, max and restore buttons
         hBmpMinButton     = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_MINBUTTON]);
@@ -310 +308 @@
         hBmpCloseButton   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTON]);
         hBmpCloseButtonDown   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTONDOWN]);
-#endif
         DevCloseDC(hdc);
     }
@@ -723 +720 @@
         if(WinQueryWindowULong(hwndFocus, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC)
         {
-                //another (non-win32) application's window
-                //set to NULL (allowed according to win32 SDK) to avoid problems
-                hwndFocus = NULL;
+            //another (non-win32) application's window
+            //set to NULL (allowed according to win32 SDK) to avoid problems
+            hwndFocus = NULL;
         }
         if((ULONG)mp2 == TRUE) {
-                HWND hwndFocusWin32 = OS2ToWin32Handle(hwndFocus);
-                recreateCaret (hwndFocusWin32);
-                win32wnd->MsgSetFocus(hwndFocusWin32);
-        }
-        else win32wnd->MsgKillFocus(OS2ToWin32Handle(hwndFocus));
+            HWND hwndFocusWin32 = OS2ToWin32Handle(hwndFocus);
+            recreateCaret (hwndFocusWin32);
+            win32wnd->MsgSetFocus(hwndFocusWin32);
+        }
+        else {
+            //If SetFocus(0) was called, then the window has already received
+            //a WM_KILLFOCUS; don't send another one
+            if(!fIgnoreKeystrokes) {
+                 win32wnd->MsgKillFocus(OS2ToWin32Handle(hwndFocus));
+            }
+            else dprintf(("Window has already received a WM_KILLFOCUS (SetFocus(0)); ignore"));
+        }
         teb->o.odin.fWM_SETFOCUS = FALSE;