Changeset 9563 for trunk/src

Timestamp:

Dec 29, 2002, 6:17:16 PM (23 years ago)

Author:

sandervl

Message:

Fix for painting a completely ownerdrawn menu (owner window was wrong); don't do anything in DoNCPaint if window is invisible

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.53 2002-12-12 13:55:41 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.54 2002-12-29 17:17:15 sandervl Exp $*/
 /*
  * Menu functions
@@ -1511 +1511 @@
       {
         OffsetRect(&lppop->items[i].rect,-lprect->left,-lprect->top);
-        MENU_DrawMenuItem( hwnd,GetMenu(hwnd), GetWindow(hwnd,GW_OWNER),
+        MENU_DrawMenuItem( hwnd,GetMenu(hwnd), hwnd,
                          memDC, &lppop->items[i], lppop->Height, TRUE, ODA_DRAWENTIRE );
         OffsetRect(&lppop->items[i].rect,lprect->left,lprect->top);

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.130 2002-12-04 15:23:38 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.131 2002-12-29 17:17:16 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -162 +162 @@
   static int minmaxwidth  = 0;
   static int minmaxheight = 0;
+
+  dprintf(("OSLibWinPositionFrameControls %x (%x,%x) %x %d", hwndFrame, dwStyle, dwExStyle, hSysMenuIcon, drawCloseButton));
 
   if(minmaxwidth == 0) {
@@ -1098 +1100 @@
 BOOL OSLibChangeCloseButtonState(HWND hwndFrame, BOOL State)
 {
+    dprintf(("OSLibChangeCloseButtonState %x %d", hwndFrame, State));
     return WinEnableMenuItem(WinWindowFromID(hwndFrame, FID_SYSMENU), SC_CLOSE, State);
 }

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.44 2002-10-15 09:18:12 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.45 2002-12-29 17:17:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -1067 +1067 @@
     dprintf(("DoNCPaint %x %x %d", getWindowHandle(), clip, suppress_menupaint));
 
+    if ( getStyle() & WS_MINIMIZE ||
+         !IsWindowVisible( getWindowHandle() )) {
+        return; /* Nothing to do */
+    }
+
     rect.top    = rect.left = 0;
     rect.right  = rectWindow.right - rectWindow.left;