Changeset 3587 for trunk/src

Timestamp:

May 22, 2000, 9:05:58 PM (25 years ago)

Author:

sandervl

Message:

update; put back removed parts

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.22 2000-05-22 17:21:09 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.23 2000-05-22 19:03:45 sandervl Exp $*/
 /*
  * Menu functions
@@ -3204 +3204 @@
     BOOL ret = FALSE;
 
-    dprintf(("USER32: TrackPopupMenu"));
+    if(lpRect) {
+         dprintf(("USER32: TrackPopupMenu %x %x (%d,%d) %x %x (%d,%d)(%d,%d)", hMenu, wFlags, x, y, nReserved, hWnd, lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
+    }
+    else dprintf(("USER32: TrackPopupMenu %x %x (%d,%d) %x %x lpRect=NULL", hMenu, wFlags, x, y, nReserved, hWnd));
 
     MENU_InitTracking(hWnd, hMenu, TRUE, wFlags);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.192 2000-05-22 17:21:11 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.193 2000-05-22 19:05:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2094 +2094 @@
     OSLibWinShowWindow(OS2Hwnd, showstate);
 
+    SendInternalMessageA(WM_SHOWWINDOW, (showstate & SWPOS_SHOW) ? 1 : 0, 0);
+
     //CB: PMFrame: WM_MINMAXFRAME SWP_* handling isn't always successful!
     if ((showstate & SWPOS_MAXIMIZE) == SWPOS_MAXIMIZE)