adobe-source-commits

[Foster B. <fos...@us...>]

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4121/adobe/test/visual/sources/mac

Modified Files:
	ui_core_implementation.cpp 
Log Message:
bug fixes, additions to array_t, documentation update

Index: ui_core_implementation.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/mac/ui_core_implementation.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ui_core_implementation.cpp	30 Mar 2005 17:17:11 -0000	1.4
--- ui_core_implementation.cpp	31 Mar 2005 18:51:01 -0000	1.5
***************
*** 13,21 ****
  #include "display.hpp"
  
- #include <adobe/value.hpp>
- #include <adobe/future/memory.hpp>
- #include <adobe/future/enum_ops.hpp>
  #include <adobe/algorithm.hpp>
  #include <adobe/dictionary.hpp>
  
  #include <boost/type_traits.hpp>
--- 13,23 ----
  #include "display.hpp"
  
  #include <adobe/algorithm.hpp>
+ #include <adobe/array.hpp>
  #include <adobe/dictionary.hpp>
+ #include <adobe/value.hpp>
+ 
+ #include <adobe/future/enum_ops.hpp>
+ #include <adobe/future/memory.hpp>
  
  #include <boost/type_traits.hpp>
***************
*** 202,205 ****
--- 204,221 ----
  /****************************************************************************************************/
  
+ 
+ // REVISIT (sparent) : This seems useful enough that we might want to move it into array.hpp
+ 
+ template <typename T1, typename T2>
+ inline adobe::array_t make_array(std::pair<T1, T2> p)
+ {
+ 	adobe::array_t a;
+ 	a.push_back(p.first);
+ 	a.push_back(p.second);
+ 	return a;
+ }
+ 
+ /****************************************************************************************************/
+ 
  adobe::dictionary_t rectangle_slice_to_dictionary(const adobe::rectangle_t::slice_t& s)
  {
***************
*** 214,217 ****
--- 230,234 ----
  	if (s.poi_m.size())
  	{
+ 	#if 0
  		adobe::points_of_interest_t::const_iterator	first(s.poi_m.begin());
  		adobe::points_of_interest_t::const_iterator	last(s.poi_m.end());
***************
*** 219,223 ****
  
  		for (; first != last; ++first)
! 			poi_array = adobe::array_push_back(poi_array, adobe::value_t(*first));
  
  		result.set(adobe::static_name_t("poi_set"), poi_array);
--- 236,245 ----
  
  		for (; first != last; ++first)
! 			poi_array.push_back(*first);
! 	#endif
! 			
! 		adobe::array_t poi_array;
! 		
! 		adobe::copy(s.poi_m, poi_array.back_inserter());
  
  		result.set(adobe::static_name_t("poi_set"), poi_array);
***************
*** 226,237 ****
  	if (s.outset_m.first || s.outset_m.second)
  	{
! 		adobe::array_t empty;
! 		result.set(adobe::static_name_t("outset"), adobe::array_push_back(adobe::array_push_back(empty, s.outset_m.first), s.outset_m.second));
  	}
  
  	if (s.frame_m.first || s.outset_m.second)
  	{
! 		adobe::array_t empty;
! 		result.set(adobe::static_name_t("frame"), adobe::array_push_back(adobe::array_push_back(empty, s.frame_m.first), s.frame_m.second));
  	}
  
--- 248,257 ----
  	if (s.outset_m.first || s.outset_m.second)
  	{
! 		result.set(adobe::static_name_t("outset"), make_array(s.outset_m));
  	}
  
  	if (s.frame_m.first || s.outset_m.second)
  	{
! 		result.set(adobe::static_name_t("frame"), make_array(s.frame_m));
  	}
  
***************
*** 239,243 ****
  	{
  		adobe::array_t empty;
! 		result.set(adobe::static_name_t("inset"), adobe::array_push_back(adobe::array_push_back(empty, s.inset_m.first), s.inset_m.second));
  	}
  
--- 259,263 ----
  	{
  		adobe::array_t empty;
! 		result.set(adobe::static_name_t("inset"), make_array(s.inset_m));
  	}
  
***************
*** 2684,2689 ****
  		dict.set(static_name_t("name"), first->name_m);
  		dict.set(static_name_t("value"), first->value_m);
! 
! 		tab_array = array_push_back(tab_array, adobe::value_t(dict));
  	}
  
--- 2704,2709 ----
  		dict.set(static_name_t("name"), first->name_m);
  		dict.set(static_name_t("value"), first->value_m);
! 		
! 		tab_array.push_back(dict);
  	}
  
***************
*** 2902,2907 ****
  		dict.set(static_name_t("modifiers"), first->modifiers_m);
  		dict.set(static_name_t("value"), first->value_m);
! 
! 		state_array = array_push_back(state_array, adobe::value_t(dict));
  	}
  
--- 2922,2927 ----
  		dict.set(static_name_t("modifiers"), first->modifiers_m);
  		dict.set(static_name_t("value"), first->value_m);
! 		
! 		state_array.push_back(dict);
  	}
  
***************
*** 4182,4186 ****
  		dict.set(static_name_t("value"), first->second);
  
! 		popup_array = array_push_back(popup_array, adobe::value_t(dict));
  	}
  
--- 4202,4206 ----
  		dict.set(static_name_t("value"), first->second);
  
! 		popup_array.push_back(dict);
  	}