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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.58 2001-07-15 14:36:38 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.59 2001-09-15 15:23:11 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -556 +556 @@
             break;
         case SC_CLOSE:
+        {
+            HWND hwnd = win32wnd->GetTopParent();
+            if(win32wnd->getWindowHandle() != hwnd) {
+                RELEASE_WNDOBJ(win32wnd);
+                win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+                if(win32wnd == NULL) {
+                    DebugInt3();
+                    goto dummymessage;
+                }
+                winMsg->hwnd = hwnd;
+            }
             win32sc = SC_CLOSE_W;
             break;
+        }
         case SC_MAXIMIZE:
             win32sc = SC_MAXIMIZE_W;
@@ -578 +590 @@
             goto dummymessage;
         }
-        winMsg->message    = WINWM_SYSCOMMAND;
+        winMsg->message= WINWM_SYSCOMMAND;
         winMsg->wParam = (WPARAM)win32sc;
         winMsg->lParam = MAKELONG((USHORT)x, (USHORT)y);