Changeset 6718 for trunk/src/user32/pmwindow.cpp

Timestamp:

Sep 15, 2001, 5:23:12 PM (24 years ago)

Author:

sandervl

Message:

SC_CLOSE translation fix + activation changes

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.144 2001-09-15 09:16:08 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.145 2001-09-15 15:23:12 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -483 +483 @@
 
     case WM_SYSCOMMAND:
-        dprintf(("OS2: WM_SYSCOMMAND %x", hwnd));
+        dprintf(("OS2: WM_SYSCOMMAND %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
         win32wnd->DispatchMsgA(pWinMsg);
         break;
@@ -925 +925 @@
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 0);
             }
-
+/*
             if(pswp->fl & SWP_ACTIVATE)
             {
@@ -931 +931 @@
                 if(!(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE))
                 {
-                    WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+                    WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+//                    WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
                 }
             }
@@ -940 +941 @@
                 if(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE)
                 {
-                    WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
+                    WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
+//                    WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
                 }
             }
+*/
 //            goto RunDefWndProc;
             goto RunDefFrameWndProc;
@@ -1083 +1086 @@
              if(!(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE))
              {
+//                WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
                 WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
              }
@@ -1092 +1096 @@
             if(WinQueryWindowULong(WinWindowFromID(hwnd,FID_CLIENT), OFFSET_WIN32FLAGS) & WINDOWFLAG_ACTIVE)
             {
+//                WinSendDlgItemMsg(hwnd, FID_CLIENT, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
                     WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
             }
@@ -1228 +1233 @@
         goto RunDefFrameWndProc;
     }
-#endif
 
     case WM_SETFOCUS:
@@ -1235 +1239 @@
         goto RunDefFrameWndProc;
     }
+#endif
 
     case WM_ACTIVATE:
@@ -1307 +1312 @@
     }
 
+#ifdef DEBUG
     case WM_QUERYFRAMEINFO:
         dprintf(("PMFRAME:WM_QUERYFRAMEINFO %x", win32wnd->getWindowHandle()));
         goto RunDefFrameWndProc;
+#endif
 
     case WM_FORMATFRAME:
@@ -1315 +1322 @@
         break;
 
+#ifdef DEBUG
     case WM_ADJUSTFRAMEPOS:
     {
@@ -1330 +1338 @@
         goto RunDefFrameWndProc;
     }
+#endif
 
     case WM_MINMAXFRAME:
@@ -1364 +1373 @@
     }
 
+#ifdef DEBUG
     case WM_UPDATEFRAME:
         dprintf(("PMFRAME:WM_UPDATEFRAME %x", win32wnd->getWindowHandle()));
         goto RunDefFrameWndProc;
+#endif
 
     case WM_TRACKFRAME:
@@ -1377 +1388 @@
 
     case WM_SYSCOMMAND:
-        dprintf(("PMFRAME: WM_SYSCOMMAND %x", win32wnd->getWindowHandle()));
-        win32wnd->DispatchMsgA(pWinMsg);
-        break;
-
+        dprintf(("PMFRAME: WM_SYSCOMMAND %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
+        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+            RELEASE_WNDOBJ(win32wnd);
+            win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
+        }
+        if(win32wnd)
+            win32wnd->DispatchMsgA(pWinMsg);
+        break;
+
+#ifdef DEBUG
     case WM_DDE_INITIATE:
     case WM_DDE_INITIATEACK:
@@ -1393 +1410 @@
          dprintf(("PMFRAME: WM_DDE %x %x", msg, win32wnd->getWindowHandle()));
          break;
+#endif
 
     default: