[Boost-commit] svn:boost r51841 - in sandbox-branches/andreo/guigl: boost/guigl libs/guigl/build/vc8ide libs/guigl/example

Subject: [Boost-commit] svn:boost r51841 - in sandbox-branches/andreo/guigl: boost/guigl libs/guigl/build/vc8ide libs/guigl/example
From: andreytorba_at_[hidden]
Date: 2009-03-18 13:00:42

Author: andreo
Date: 2009-03-18 13:00:41 EDT (Wed, 18 Mar 2009)
New Revision: 51841
URL: http://svn.boost.org/trac/boost/changeset/51841

Log:
added sexy_button
Text files modified: 
   sandbox-branches/andreo/guigl/boost/guigl/parameters.hpp             |     6 +++---                                  
   sandbox-branches/andreo/guigl/boost/guigl/types.hpp                  |     9 +++------                               
   sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj   |     4 ++++                                    
   sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/example.vcproj |     4 ++++                                    
   sandbox-branches/andreo/guigl/libs/guigl/example/Jamfile             |     3 ++-                                     
   5 files changed, 16 insertions(+), 10 deletions(-)

Modified: sandbox-branches/andreo/guigl/boost/guigl/parameters.hpp
==============================================================================
--- sandbox-branches/andreo/guigl/boost/guigl/parameters.hpp	(original)
+++ sandbox-branches/andreo/guigl/boost/guigl/parameters.hpp	2009-03-18 13:00:41 EDT (Wed, 18 Mar 2009)
@@ -19,9 +19,9 @@
     BOOST_PARAMETER_TYPED_NAME_WDEFAULT(label,const std::string,"")
     BOOST_PARAMETER_TYPED_NAME_WDEFAULT(size,const size_type,(size_type(200,200)))
     BOOST_PARAMETER_TYPED_NAME_WDEFAULT(position,const position_type,(size_type(0,0)))
-    BOOST_PARAMETER_TYPED_NAME_WDEFAULT(background,const color_type,(make_color(0,0,0)))
-    BOOST_PARAMETER_TYPED_NAME_WDEFAULT(color,const color_type,(make_color(1,1,1)))
-    BOOST_PARAMETER_TYPED_NAME_WDEFAULT(active_color,const color_type,(make_color(1,0,0)))
+    BOOST_PARAMETER_TYPED_NAME_WDEFAULT(background,const color_type,(white()))
+    BOOST_PARAMETER_TYPED_NAME_WDEFAULT(color,const color_type,(blue()))
+    BOOST_PARAMETER_TYPED_NAME_WDEFAULT(active_color,const color_type,(red()))
     BOOST_PARAMETER_TYPED_NAME_WDEFAULT(depth,const bool,false)
     BOOST_PARAMETER_TYPED_NAME_WDEFAULT(min,const double,0.0)
     BOOST_PARAMETER_TYPED_NAME_WDEFAULT(max,const double,1.0)

Modified: sandbox-branches/andreo/guigl/boost/guigl/types.hpp
==============================================================================
--- sandbox-branches/andreo/guigl/boost/guigl/types.hpp	(original)
+++ sandbox-branches/andreo/guigl/boost/guigl/types.hpp	2009-03-18 13:00:41 EDT (Wed, 18 Mar 2009)
@@ -19,12 +19,9 @@
 typedef gil::point2<double> position_type;
 typedef gil::rgba32f_pixel_t color_type;
 
-//TODO: move 'make_color' to appropriate place
-inline color_type make_color(float r, float g, float b, float a = 1.0f)
-{
-    return color_type(r, g, b, a);
-}
-
 }}
 
+// TODO: is it appropriate place?
+#include <boost/guigl/color.hpp>
+
 #endif // BOOST__GUIGL__TYPES_HPP

Modified: sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj
==============================================================================
--- sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj	(original)
+++ sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/build.vcproj	2009-03-18 13:00:41 EDT (Wed, 18 Mar 2009)
@@ -85,6 +85,10 @@
 				>
                         </File>
                         <File
+				RelativePath="..\..\..\..\boost\guigl\color.hpp"
+				>
+			</File>
+			<File
                                 RelativePath="..\..\..\..\boost\guigl\export_symbols.hpp"
 				>
                         </File>

Modified: sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/example.vcproj
==============================================================================
--- sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/example.vcproj	(original)
+++ sandbox-branches/andreo/guigl/libs/guigl/build/vc8ide/example.vcproj	2009-03-18 13:00:41 EDT (Wed, 18 Mar 2009)
@@ -67,6 +67,10 @@
 			>
                 </File>
                 <File
+			RelativePath="..\..\example\sexy_button.cpp"
+			>
+		</File>
+		<File
                         RelativePath="..\..\example\two_buttons.cpp"
 			>
                 </File>

Modified: sandbox-branches/andreo/guigl/libs/guigl/example/Jamfile
==============================================================================
--- sandbox-branches/andreo/guigl/libs/guigl/example/Jamfile	(original)
+++ sandbox-branches/andreo/guigl/libs/guigl/example/Jamfile	2009-03-18 13:00:41 EDT (Wed, 18 Mar 2009)
@@ -26,9 +26,10 @@
 exe custom_example : custom_example.cpp ;
 exe window_only_example : window_only_example.cpp ;
 exe overlapping_example : overlapping_example.cpp ;
+exe sexy_button : sexy_button.cpp ;
 
 install window_example_stage
-    : window_example custom_example window_only_example overlapping_example
+    : window_example custom_example window_only_example overlapping_example sexy_button
     : <install-dependencies>on <install-type>EXE
       <install-type>LIB <location>$(TOP)/bin/stage/window_example
     ;