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

Timestamp:

Jun 23, 2000, 9:04:13 PM (25 years ago)

Author:

sandervl

Message:

wsprintf fix, menu accelerator fix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.201 2000-06-14 13:15:25 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.202 2000-06-23 19:04:12 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -379 +379 @@
   {
         SetParent(cs->hwndParent);
-        owner = GetWindowFromHandle(cs->hwndParent);
-        if(owner == NULL)
+//        owner = GetWindowFromHandle(cs->hwndParent);
+        owner = 0;
+/*        if(owner == NULL)
         {
             dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
             SetLastError(ERROR_INVALID_WINDOW_HANDLE);
             return FALSE;
-        }
+        }*/
         //SvL: Shell positioning shouldn't be done for child windows! (breaks Notes)
         fXDefault = fCXDefault = FALSE;
@@ -516 +517 @@
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  dwOSWinStyle,(char *)windowNameA,
-                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
+                                 (owner) ? owner->getOS2WindowHandle() : ((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP),
                                  (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
                                  0, fTaskList,fXDefault | fCXDefault,windowClass->getStyle());
@@ -1655 +1656 @@
                 else    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
         }
+#if 0
         else /* check for Ctrl-Esc */
                 if (wParam != VK_ESCAPE) MessageBeep(0);
                         break;
+#endif
     }
 
@@ -2550 +2553 @@
     for (child = (Win32BaseWindow *)getFirstChild(); child; child = (Win32BaseWindow *)child->getNextChild())
     {
-        dprintf(("EnumChildWindows: enumerating child %x", child->getWindowHandle()));
+        dprintf(("EnumChildWindows: enumerating child %x (owner %x; parent %x)", child->getWindowHandle(), (child->getOwner()) ? child->getOwner()->getWindowHandle() : 0, getWindowHandle()));
         hwnd = child->getWindowHandle();
         if(child->getOwner()) {