Changeset 9791 for trunk/src/user32/win32wbase.cpp

Timestamp:

Feb 13, 2003, 11:12:27 AM (23 years ago)

Author:

sandervl

Message:

Handle SetFocus(0) correctly: keystrokes are converted into WM_SYSKEYDOWN/(WM_SYSCHAR)/WM_SYSKEYUP messages

File:

• trunk/src/user32/win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.357 2003-02-11 14:20:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.358 2003-02-13 10:12:25 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1097 +1097 @@
 ULONG Win32BaseWindow::MsgSetFocus(HWND hwnd)
 {
+    //Notify that focus has changed (necessary for SetFocus(0) handling)
+    SetFocusChanged();
+
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
@@ -1113 +1116 @@
 ULONG Win32BaseWindow::MsgKillFocus(HWND hwnd)
 {
+    //Notify that focus has changed (necessary for SetFocus(0) handling)
+    SetFocusChanged();
+
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
@@ -1183 +1189 @@
                     if (win32top) {
                         //Must use client window handle (not frame!!)
-                        OSLibWinSetFocus(win32top->getOS2WindowHandle());
+                        SetFocus(win32top->getWindowHandle());
                         RELEASE_WNDOBJ(win32top);
                     }