Changeset 6745 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

Sep 17, 2001, 3:31:30 PM (24 years ago)

Author:

sandervl

Message:

activation + sc_close fixes

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (2 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.59 2001-09-15 15:23:11 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.60 2001-09-17 13:31:29 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -557 +557 @@
         case SC_CLOSE:
         {
-            HWND hwnd = win32wnd->GetTopParent();
-            if(win32wnd->getWindowHandle() != hwnd) {
-                RELEASE_WNDOBJ(win32wnd);
-                win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-                if(win32wnd == NULL) {
-                    DebugInt3();
-                    goto dummymessage;
+            //FALSE -> keyboard operation = user pressed Alt-F4 -> close app
+            //TRUE  -> user clicked on close button -> close window
+            if(SHORT2FROMMP(os2Msg->mp2) == FALSE) 
+            {
+                HWND hwnd = win32wnd->GetTopParent();
+                if(win32wnd->getWindowHandle() != hwnd) {
+                    RELEASE_WNDOBJ(win32wnd);
+                    win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+                    if(win32wnd == NULL) {
+                        DebugInt3();
+                        goto dummymessage;
+                    }
+                    winMsg->hwnd = hwnd;
                 }
-                winMsg->hwnd = hwnd;
             }
             win32sc = SC_CLOSE_W;