Changeset 4485 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 16, 2000, 1:02:50 PM (25 years ago)

Author:

sandervl

Message:

sendmessage + sc_close fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.216 2000-10-11 23:07:40 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.217 2000-10-16 11:02:50 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1607 +1607 @@
             Win32BaseWindow *window = GetTopParent();
             if(window && !(window->getClass()->getStyle() & CS_NOCLOSE))
-                PostMessageA(getWindowHandle(), WM_SYSCOMMAND, SC_CLOSE, 0);
+                PostMessageA(window->getWindowHandle(), WM_SYSCOMMAND, SC_CLOSE, 0);
             return 0;
         }
@@ -1663 +1663 @@
         if((HIWORD(lParam) & KEYDATA_ALT) && wParam)
         {
-                if (wParam == VK_TAB || wParam == VK_ESCAPE)
+                if (wParam == VK_TAB || wParam == VK_ESCAPE || wParam == VK_F4)
                         break;
                 if (wParam == VK_SPACE && (getStyle() & WS_CHILD)) {
@@ -1852 +1852 @@
  BOOL    fInternalMsgBackup = fInternalMsg;
 
+  //if the destination window was created by this process & thread, call window proc directly
+  if(dwProcessId != currentProcessId || dwThreadId != GetCurrentThreadId()) {
+        dprintf(("SendMessages (inter-process) %x %x %x %x", getWindowHandle(), Msg, wParam, lParam));
+        return OSLibSendMessage(getOS2WindowHandle(), Msg, wParam, lParam, FALSE);
+  }
+
   DebugPrintMessage(getWindowHandle(), Msg, wParam, lParam, FALSE, TRUE);
 
@@ -1905 +1911 @@
  LRESULT rc;
  BOOL    fInternalMsgBackup = fInternalMsg;
+
+  //if the destination window was created by this process & thread, call window proc directly
+  if(dwProcessId != currentProcessId || dwThreadId != GetCurrentThreadId()) {
+        dprintf(("SendMessages (inter-process) %x %x %x %x", getWindowHandle(), Msg, wParam, lParam));
+        return OSLibSendMessage(getOS2WindowHandle(), Msg, wParam, lParam, FALSE);
+  }
 
   DebugPrintMessage(getWindowHandle(), Msg, wParam, lParam, TRUE, TRUE);