commit 6d77d3a1df2f707ed7543febf9364152cfcde9c7
author Francois Gouget <fgouget@psn.net> Sat Mar 25 21:44:35 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Mar 25 21:44:35 2000 +0000
tree 17dbd46ac127d5268fecf2f15fa3eecaac0c9af9
parent 77c30552aae7d4afa9b8a69b839b13efaabbf7e6

Use min/max instead of MIN/MAX.

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index 6eeb608..5afe241 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -839,9 +839,9 @@
 	
 	lpitem->rect.right  += size.cx;
 	if (TWEAK_WineLook == WIN31_LOOK)
-	    lpitem->rect.bottom += MAX( size.cy, GetSystemMetrics(SM_CYMENU) );
+	    lpitem->rect.bottom += max( size.cy, GetSystemMetrics(SM_CYMENU) );
 	else
-	    lpitem->rect.bottom += MAX (size.cy, GetSystemMetrics(SM_CYMENU)-1);
+	    lpitem->rect.bottom += max(size.cy, GetSystemMetrics(SM_CYMENU)-1);
 	lpitem->xTab = 0;
 
 	if (menuBar)
@@ -905,17 +905,17 @@
 	    MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, FALSE );
 
 	    if (lpitem->fType & MF_MENUBARBREAK) orgX++;
-	    maxX = MAX( maxX, lpitem->rect.right );
+	    maxX = max( maxX, lpitem->rect.right );
 	    orgY = lpitem->rect.bottom;
 	    if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab)
 	    {
-		maxTab = MAX( maxTab, lpitem->xTab );
-		maxTabWidth = MAX(maxTabWidth,lpitem->rect.right-lpitem->xTab);
+		maxTab = max( maxTab, lpitem->xTab );
+		maxTabWidth = max(maxTabWidth,lpitem->rect.right-lpitem->xTab);
 	    }
 	}
 
 	  /* Finish the column (set all items to the largest width found) */
-	maxX = MAX( maxX, maxTab + maxTabWidth );
+	maxX = max( maxX, maxTab + maxTabWidth );
 	for (lpitem = &lppop->items[start]; start < i; start++, lpitem++)
 	{
 	    lpitem->rect.right = maxX;
@@ -923,7 +923,7 @@
 		lpitem->xTab = maxTab;
 	
 	}
-	lppop->Height = MAX( lppop->Height, orgY );
+	lppop->Height = max( lppop->Height, orgY );
     }
 
     lppop->Width  = maxX;
@@ -986,7 +986,7 @@
 		if (i != start) break;
 		else lpitem->rect.right = lprect->right;
 	    }
-	    maxY = MAX( maxY, lpitem->rect.bottom );
+	    maxY = max( maxY, lpitem->rect.bottom );
 	    orgX = lpitem->rect.right;
 	}