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.

windows/nonclient.c

diff --git a/windows/nonclient.c b/windows/nonclient.c
index 6394790..8b0edd8 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -2157,23 +2157,23 @@
         SetRect(&mouseRect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
     if (ON_LEFT_BORDER(hittest))
     {
-	mouseRect.left  = MAX( mouseRect.left, sizingRect.right-maxTrack.x );
-	mouseRect.right = MIN( mouseRect.right, sizingRect.right-minTrack.x );
+	mouseRect.left  = max( mouseRect.left, sizingRect.right-maxTrack.x );
+	mouseRect.right = min( mouseRect.right, sizingRect.right-minTrack.x );
     }
     else if (ON_RIGHT_BORDER(hittest))
     {
-	mouseRect.left  = MAX( mouseRect.left, sizingRect.left+minTrack.x );
-	mouseRect.right = MIN( mouseRect.right, sizingRect.left+maxTrack.x );
+	mouseRect.left  = max( mouseRect.left, sizingRect.left+minTrack.x );
+	mouseRect.right = min( mouseRect.right, sizingRect.left+maxTrack.x );
     }
     if (ON_TOP_BORDER(hittest))
     {
-	mouseRect.top    = MAX( mouseRect.top, sizingRect.bottom-maxTrack.y );
-	mouseRect.bottom = MIN( mouseRect.bottom,sizingRect.bottom-minTrack.y);
+	mouseRect.top    = max( mouseRect.top, sizingRect.bottom-maxTrack.y );
+	mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minTrack.y);
     }
     else if (ON_BOTTOM_BORDER(hittest))
     {
-	mouseRect.top    = MAX( mouseRect.top, sizingRect.top+minTrack.y );
-	mouseRect.bottom = MIN( mouseRect.bottom, sizingRect.top+maxTrack.y );
+	mouseRect.top    = max( mouseRect.top, sizingRect.top+minTrack.y );
+	mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+maxTrack.y );
     }
     if (wndPtr->dwStyle & WS_CHILD)
     {
@@ -2231,10 +2231,10 @@
 	    case VK_RIGHT: pt.x += 8; break;		
 	}
 
-	pt.x = MAX( pt.x, mouseRect.left );
-	pt.x = MIN( pt.x, mouseRect.right );
-	pt.y = MAX( pt.y, mouseRect.top );
-	pt.y = MIN( pt.y, mouseRect.bottom );
+	pt.x = max( pt.x, mouseRect.left );
+	pt.x = min( pt.x, mouseRect.right );
+	pt.y = max( pt.y, mouseRect.top );
+	pt.y = min( pt.y, mouseRect.bottom );
 
 	dx = pt.x - capturePoint.x;
 	dy = pt.y - capturePoint.y;