[adobe-source-commits] sandbox/visual_refactor/adobe/test/visual/sources client_assembler.cpp,1.4,1.5

[Ralph T. <ra...@us...>]

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

Modified Files:
	client_assembler.cpp 
Log Message:
Factory is mostly done. This change adds in the factory functions, and makes client_assembler directly call the main factory function (eventually it will call a developer-supplied function for creating widgets). Unfortunately I think that it may break panels inside tab widgets. Hopefully I will be able to finish this work off by the end of the week, and we'll be able to think about merging it back into the main sandbox.

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/client_assembler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** client_assembler.cpp	20 Apr 2005 22:17:46 -0000	1.4
--- client_assembler.cpp	22 Apr 2005 07:32:52 -0000	1.5
***************
*** 289,293 ****
  struct dialog_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	dialog_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  
  	void		place(const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t& data);
--- 289,295 ----
  struct dialog_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	typedef	adobe::window_t	widget_type_t;
! 
[...1390 lines suppressed...]
! 		parent.empty() ?
! 			adobe::widget_node_t(adobe::eve_t::iterator(), adobe::get_main_display().root()) :
! 			boost::any_cast<adobe::widget_node_t>(parent),
! 		token);
  }
  
***************
*** 3326,3331 ****
  	
  	adobe::eve::parse(stream, adobe::line_position_t(file_name), adobe::eve::position_t(),
! 			boost::bind(&::client_assembler, boost::ref(result->assemblage_m),
! 			boost::ref(*result_eve), boost::ref(token), _1, _3, boost::bind(adobe::eve::evaluate_arguments(), _4)));
  	
  	result_eve->evaluate(adobe::eve_t::evaluate_flat);
--- 3490,3494 ----
  	
  	adobe::eve::parse(stream, adobe::line_position_t(file_name), adobe::eve::position_t(),
! 			boost::bind(&::client_assembler, boost::ref(token), _1, _3, boost::bind(adobe::eve::evaluate_arguments(), _4)));
  	
  	result_eve->evaluate(adobe::eve_t::evaluate_flat);