Changeset 4122 for trunk/src

Timestamp:

Aug 30, 2000, 3:55:28 PM (25 years ago)

Author:

sandervl

Message:

WM_SETFOCUS fix

File:

• trunk/src/user32/pmwindow.cpp (modified) (5 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.100 2000-07-20 18:08:12 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.101 2000-08-30 13:55:28 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -778 +778 @@
                 WinSendMsg(hwndLoseFocus, WM_SETSELECTION, (MPARAM)0, (MPARAM)0);
         }
+        //SvL: Check if window is still valid
+        win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+        if(win32wnd == NULL) {
+                return (MRESULT)rc;
+        } 
         if(usSetFocus) 
         {
@@ -789 +794 @@
                 }
           }
+          //SvL: Check if window is still valid
+          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+          if(win32wnd == NULL) {
+                return (MRESULT)rc;
+          } 
           if(!(fsFocusChange & FC_NOSETACTIVE)) 
           {
@@ -813 +823 @@
                 }
           }
+          //SvL: Check if window is still valid
+          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+          if(win32wnd == NULL) {
+                return (MRESULT)rc;
+          } 
           if(!(fsFocusChange & FC_NOSETACTIVE)) {
                 if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent())) {
@@ -860 +875 @@
       RestoreOS2TIB();
       return (MRESULT)TRUE;
+    }
+
+    case WM_REALIZEPALETTE:
+    {
+        dprintf(("OS2: WM_REALIZEPALETTE"));
+        goto RunDefWndProc;
     }