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

Timestamp:

Sep 29, 1999, 11:16:32 AM (26 years ago)

Author:

sandervl

Message:

WM_ACTIVATE(APP) changes

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.11 1999-09-28 13:27:35 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.12 1999-09-29 09:16:31 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -379 +379 @@
     case WM_ACTIVATE:
     {
-      HWND hwndActivate = (HWND)mp1;
-
-        dprintf(("OS2: WM_ACTIVATE %x", hwnd));
+      HWND hwndActivate = (HWND)mp2;
+      BOOL fMinimized = FALSE;
+
+        dprintf(("OS2: WM_ACTIVATE %x %x", hwnd, hwndActivate));
         if(WinQueryWindowULong(hwndActivate, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
                 //another (non-win32) application's window
@@ -387 +388 @@
                 hwndActivate = NULL;
         }
-        if(win32wnd->MsgActivate(1, hwndActivate)) {
+        if(WinQueryWindowULong(hwnd, QWL_STYLE) & WS_MINIMIZED)
+        {
+           fMinimized = TRUE;
+        }
+
+        if(win32wnd->MsgActivate(SHORT1FROMMP(mp1), fMinimized, Win32BaseWindow::OS2ToWin32Handle(hwndActivate))) {
                 goto RunDefWndProc;
         }
@@ -407 +413 @@
         }
         if((ULONG)mp2 == TRUE) {
-                rc = win32wnd->MsgSetFocus(hwndFocus);
-        }
-        else    rc = win32wnd->MsgKillFocus(hwndFocus);
+                rc = win32wnd->MsgSetFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
+        }
+        else    rc = win32wnd->MsgKillFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
         if(rc) {
                 goto RunDefWndProc;