[Smartwin-cvs] SmartWin/tests/WidgetSlider Main.cpp,1.14,1.15

[andrew7 <bd...@us...>]

Update of /cvsroot/smartwin/SmartWin/tests/WidgetSlider
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23517/tests/WidgetSlider

Modified Files:
	Main.cpp 
Log Message:
replaced std:min( )  with (std:min) ( ) to allow min to be a macro.

Index: Main.cpp
===================================================================
RCS file: /cvsroot/smartwin/SmartWin/tests/WidgetSlider/Main.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Main.cpp	20 Apr 2006 05:03:40 -0000	1.14
+++ Main.cpp	3 Nov 2006 13:22:25 -0000	1.15
@@ -1,5 +1,5 @@
 // $Revision$
-// Unit test for WidgetTextBox, tries to instantiate all different forms of WidgetTextBox and also tries to use all functions
+// Unit test for WidgetSlider, tries to instantiate all different forms of WidgetSlider and also tries to use all functions
 
 #include "SmartWin.h"
 #include "resource.h"
@@ -71,7 +71,7 @@
 		{
 			for ( int y = rc.pos.y; y < rc.pos.y + rc.size.y; ++y )
 			{
-				COLORREF color = ColorUtilities::alphaBlend( canvas.getPixel( x, y ), RGB( std::min( 255, x * 2 ), 255 - std::min( 255, y ), std::min( 255, y ) ) );
+				COLORREF color = ColorUtilities::alphaBlend( canvas.getPixel( x, y ), RGB( (std::min)( 255, x * 2 ), 255 - (std::min)( 255, y ), (std::min)( 255, y ) ) );
 				canvas.setPixel( x, y, color );
 			}
 		}