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

[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-serv1374/visual_refactor/adobe/test/visual/sources

Modified Files:
	client_assembler.cpp 
Log Message:
mac_token_t has gone, and factory_token_t has replaced it. This is the beginning of adding the factory support to client_assembler, things left for me to do are:

 - Remove "window_t* root_m" from factory_token_t, and put signals to bind to (for show window, hide window, etc) in instead.
 - Write factory functions for each widget (as detailed in factory.hpp).
 - Write convenience factory function "default_factory"
 - Make client_assembler fn use the factory function instead of having knowledge of the widgetry (as it currently does with maker_t, etc).

Then we should have a really flexible factory mechanism in place. This code compiles on Windows with MSVC 2003.

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/client_assembler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** client_assembler.cpp	19 Apr 2005 17:55:57 -0000	1.2
--- client_assembler.cpp	20 Apr 2005 20:34:08 -0000	1.3
***************
*** 8,11 ****
--- 8,12 ----
  
  #include "client_assembler.hpp"
+ #include "factory.hpp"
  
  #include <iostream>
***************
*** 249,275 ****
  /****************************************************************************************************/
  
- struct mac_token_t
- {
- 	mac_token_t(adobe::sheet_t& sheet, adobe::eve_t& layout, adobe::assemblage_t& slave, eve_client::eve_client_holder& holder, const eve_client::button_notifier_t& notifier, size_enum_t dialog_size) :
- 		assemblage_m(slave),
- 		sheet_m(sheet),
- 		layout_m(layout),
- 		holder_m(holder),
- 		notifier_m(notifier),
- 		dialog_size_m(dialog_size),
- 		root_m(0)
- 	{ }
- 
- 	adobe::assemblage_t&			assemblage_m;
- 	adobe::window_t*				root_m;
- 	adobe::sheet_t&					sheet_m;
- 	eve_client::eve_client_holder&	holder_m;
- 	adobe::eve_t&					layout_m;
- 	eve_client::button_notifier_t	notifier_m;
- 	size_enum_t						dialog_size_m;
- };
- 
- /****************************************************************************************************/
- 
  struct client_proxy_t
  {
--- 250,253 ----
***************
*** 311,315 ****
  struct dialog_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	dialog_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  
  	void		place(const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t& data);
--- 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);
***************
*** 332,336 ****
  struct palette_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	palette_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  
  	void		place(const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t& data);
--- 310,314 ----
  struct palette_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	palette_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);
***************
*** 348,352 ****
  struct group_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 326,330 ----
  struct group_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	group_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 368,372 ****
  struct tab_group_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	tab_group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 346,350 ----
  struct tab_group_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	tab_group_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 391,395 ****
  struct panel_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	panel_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 369,373 ----
  struct panel_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	panel_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 410,414 ****
  struct separator_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	separator_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 388,392 ----
  struct separator_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	separator_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 425,429 ****
  struct message_proxy_t : client_proxy_t
  {
! 	explicit message_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void					calculate();
--- 403,407 ----
  struct message_proxy_t : client_proxy_t
  {
! 	explicit message_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void					calculate();
***************
*** 462,466 ****
  { }
  
! message_proxy_t::message_proxy_t(cosnt adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*) :
  	view_proxy_t(view_t(), parameters),
  	client_proxy_t(parameters),
--- 440,444 ----
  { }
  
! message_proxy_t::message_proxy_t(cosnt adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*) :
  	view_proxy_t(view_t(), parameters),
  	client_proxy_t(parameters),
***************
*** 484,488 ****
  struct button_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		place(const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t& data);
--- 462,466 ----
  struct button_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	button_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);
***************
*** 524,528 ****
  struct popup_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	popup_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 502,506 ----
  struct popup_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	popup_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 543,547 ****
  struct link_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	link_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 521,525 ----
  struct link_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	link_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 566,570 ****
  struct checkbox_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	checkbox_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 544,548 ----
  struct checkbox_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	checkbox_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 584,588 ****
  struct radio_button_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	radio_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 562,566 ----
  struct radio_button_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	radio_button_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 612,616 ****
  struct bevel_button_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	bevel_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 590,594 ----
  struct bevel_button_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	bevel_button_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 649,653 ****
  struct progress_bar_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	progress_bar_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 627,631 ----
  struct progress_bar_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	progress_bar_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 667,671 ****
  struct static_text_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	static_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 645,649 ----
  struct static_text_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	static_text_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 682,686 ****
  struct edit_number_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	edit_number_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 660,664 ----
  struct edit_number_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	edit_number_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 741,745 ****
  struct slider_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	slider_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 719,723 ----
  struct slider_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	slider_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  	
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 763,767 ****
  struct edit_text_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	edit_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
--- 741,745 ----
  struct edit_text_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit	edit_text_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t*);
  
  	void		calculate(adobe::eve_t::calculate_data_t&);
***************
*** 814,818 ****
  
  template <typename Widget>
! void set_up_control(client_proxy_t& local, Widget& control, client_proxy_t& parent, mac_token_t& token)
  {
  	local.size_m = parent.size_m;
--- 792,796 ----
  
  template <typename Widget>
! void set_up_control(client_proxy_t& local, Widget& control, client_proxy_t& parent, adobe::factory_token_t& token)
  {
  	local.size_m = parent.size_m;
***************
*** 823,827 ****
  
  #if defined(ADOBE_SERIALIZATION)
! 	token.assemblage_m.hold_connection(token.holder_m.widget_stream_m.connect(boost::bind(&stream_out<Widget>, boost::ref(control), _1)));
  #else
  	#pragma unused(token)
--- 801,805 ----
  
  #if defined(ADOBE_SERIALIZATION)
! 	token.assemblage_m.hold_connection(token.widget_stream_m.connect(boost::bind(&stream_out<Widget>, boost::ref(control), _1)));
  #else
  	#pragma unused(token)
***************
*** 968,972 ****
  struct column_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit column_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) :
  		client_proxy_t(parameters)
  	{
--- 946,950 ----
  struct column_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit column_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t* parent) :
  		client_proxy_t(parameters)
  	{
***************
*** 996,1000 ****
  struct row_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit row_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) :
  		client_proxy_t(parameters)
  	{
--- 974,978 ----
  struct row_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit row_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t* parent) :
  		client_proxy_t(parameters)
  	{
***************
*** 1024,1028 ****
  struct overlay_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit overlay_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) :
  		client_proxy_t(parameters)
  	{
--- 1002,1006 ----
  struct overlay_proxy_t : client_proxy_t, adobe::extents_slices_t
  {
! 	explicit overlay_proxy_t(const adobe::dictionary_t& parameters, adobe::factory_token_t&, client_proxy_t* parent) :
  		client_proxy_t(parameters)
  	{
***************
*** 1259,1263 ****
  template <bevel_emulation_t emulation>
  bevel_button_proxy_t<emulation>::bevel_button_proxy_t(	const adobe::dictionary_t&	parameters,
! 														mac_token_t&				token,
  														client_proxy_t*				parent) :
  	client_proxy_t(parameters)
--- 1237,1241 ----
  template <bevel_emulation_t emulation>
  bevel_button_proxy_t<emulation>::bevel_button_proxy_t(	const adobe::dictionary_t&	parameters,
! 														adobe::factory_token_t&				token,
  														client_proxy_t*				parent) :
  	client_proxy_t(parameters)
***************
*** 1422,1426 ****
  
  progress_bar_proxy_t::progress_bar_proxy_t(	const adobe::dictionary_t&	parameters,
! 											mac_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters)
--- 1400,1404 ----
  
  progress_bar_proxy_t::progress_bar_proxy_t(	const adobe::dictionary_t&	parameters,
! 											adobe::factory_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters)
***************
*** 1501,1505 ****
  
  static_text_proxy_t::static_text_proxy_t(	const adobe::dictionary_t&	parameters,
! 											mac_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 1479,1483 ----
  
  static_text_proxy_t::static_text_proxy_t(	const adobe::dictionary_t&	parameters,
! 											adobe::factory_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 1562,1566 ****
  
  edit_text_proxy_t::edit_text_proxy_t(	const adobe::dictionary_t&	parameters,
! 										mac_token_t&				token,
  										client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 1540,1544 ----
  
  edit_text_proxy_t::edit_text_proxy_t(	const adobe::dictionary_t&	parameters,
! 										adobe::factory_token_t&				token,
  										client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 1691,1695 ****
  
  slider_proxy_t::slider_proxy_t(	const adobe::dictionary_t&	parameters,
! 								mac_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 1669,1673 ----
  
  slider_proxy_t::slider_proxy_t(	const adobe::dictionary_t&	parameters,
! 								adobe::factory_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 1795,1799 ****
  
  edit_number_proxy_t::edit_number_proxy_t(	const adobe::dictionary_t&	parameters,
! 											mac_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 1773,1777 ----
  
  edit_number_proxy_t::edit_number_proxy_t(	const adobe::dictionary_t&	parameters,
! 											adobe::factory_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 2114,2118 ****
  
  group_proxy_t::group_proxy_t(	const adobe::dictionary_t&	parameters,
! 								mac_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 2092,2096 ----
  
  group_proxy_t::group_proxy_t(	const adobe::dictionary_t&	parameters,
! 								adobe::factory_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 2225,2229 ****
  
  tab_group_proxy_t::tab_group_proxy_t(	const adobe::dictionary_t&	parameters,
! 										mac_token_t&				token,
  										client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 2203,2207 ----
  
  tab_group_proxy_t::tab_group_proxy_t(	const adobe::dictionary_t&	parameters,
! 										adobe::factory_token_t&				token,
  										client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 2311,2315 ****
  
  panel_proxy_t::panel_proxy_t(	const adobe::dictionary_t&	parameters,
! 								mac_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters)
--- 2289,2293 ----
  
  panel_proxy_t::panel_proxy_t(	const adobe::dictionary_t&	parameters,
! 								adobe::factory_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters)
***************
*** 2364,2368 ****
  
  separator_proxy_t::separator_proxy_t(	const adobe::dictionary_t&	parameters,
! 										mac_token_t&				token,
  										client_proxy_t*				parent) :
  	client_proxy_t(parameters)
--- 2342,2346 ----
  
  separator_proxy_t::separator_proxy_t(	const adobe::dictionary_t&	parameters,
! 										adobe::factory_token_t&				token,
  										client_proxy_t*				parent) :
  	client_proxy_t(parameters)
***************
*** 2456,2460 ****
  
  template <typename Cont>
! void state_set_push_back(Cont& state_set, mac_token_t& token, adobe::button_t& control, const button_proxy_t::item_t& temp)
  {
  	state_set.push_back(adobe::button_t::state_descriptor_t());
--- 2434,2438 ----
  
  template <typename Cont>
! void state_set_push_back(Cont& state_set, adobe::factory_token_t& token, adobe::button_t& control, const button_proxy_t::item_t& temp)
  {
  	state_set.push_back(adobe::button_t::state_descriptor_t());
***************
*** 2481,2485 ****
  
  button_proxy_t::button_proxy_t(	const adobe::dictionary_t&	parameters,
! 								mac_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters)
--- 2459,2463 ----
  
  button_proxy_t::button_proxy_t(	const adobe::dictionary_t&	parameters,
! 								adobe::factory_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters)
***************
*** 2533,2537 ****
  
  popup_proxy_t::popup_proxy_t(	const adobe::dictionary_t&	parameters,
! 								mac_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters)
--- 2511,2515 ----
  
  popup_proxy_t::popup_proxy_t(	const adobe::dictionary_t&	parameters,
! 								adobe::factory_token_t&				token,
  								client_proxy_t*				parent) :
  	client_proxy_t(parameters)
***************
*** 2609,2613 ****
  
  link_proxy_t::link_proxy_t(	const adobe::dictionary_t&	parameters,
! 							mac_token_t&				token,
  							client_proxy_t*				parent) :
  	client_proxy_t(parameters)
--- 2587,2591 ----
  
  link_proxy_t::link_proxy_t(	const adobe::dictionary_t&	parameters,
! 							adobe::factory_token_t&				token,
  							client_proxy_t*				parent) :
  	client_proxy_t(parameters)
***************
*** 2681,2685 ****
  
  radio_button_proxy_t::radio_button_proxy_t(	const adobe::dictionary_t&	parameters,
! 											mac_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 2659,2663 ----
  
  radio_button_proxy_t::radio_button_proxy_t(	const adobe::dictionary_t&	parameters,
! 											adobe::factory_token_t&				token,
  											client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 2749,2753 ****
  
  checkbox_proxy_t::checkbox_proxy_t(	const adobe::dictionary_t&	parameters,
! 									mac_token_t&				token,
  									client_proxy_t*				parent) :
  	client_proxy_t(parameters),
--- 2727,2731 ----
  
  checkbox_proxy_t::checkbox_proxy_t(	const adobe::dictionary_t&	parameters,
! 									adobe::factory_token_t&				token,
  									client_proxy_t*				parent) :
  	client_proxy_t(parameters),
***************
*** 2837,2841 ****
  
  dialog_proxy_t::dialog_proxy_t(	const adobe::dictionary_t&	parameters,
! 								mac_token_t&				token,
  								client_proxy_t*) :
  	client_proxy_t(parameters),
--- 2815,2819 ----
  
  dialog_proxy_t::dialog_proxy_t(	const adobe::dictionary_t&	parameters,
! 								adobe::factory_token_t&				token,
  								client_proxy_t*) :
  	client_proxy_t(parameters),
***************
*** 2927,2931 ****
  
  palette_proxy_t::palette_proxy_t(	const adobe::dictionary_t&	parameters,
! 									mac_token_t&				token,
  									client_proxy_t*) :
  	client_proxy_t(parameters)
--- 2905,2909 ----
  
  palette_proxy_t::palette_proxy_t(	const adobe::dictionary_t&	parameters,
! 									adobe::factory_token_t&				token,
  									client_proxy_t*) :
  	client_proxy_t(parameters)
***************
*** 3093,3097 ****
  
  template <typename T>
! boost::any wire_to_eve(adobe::assemblage_t& assemblage, adobe::eve_t& eve, mac_token_t& token, const boost::any& any_parent, const adobe::dictionary_t& parameters)
  {
  	// The view_proxy_t will be owned by Eve. We are only interested in deleting the proxy object.
--- 3071,3075 ----
  
  template <typename T>
! boost::any wire_to_eve(adobe::assemblage_t& assemblage, adobe::eve_t& eve, adobe::factory_token_t& token, const boost::any& any_parent, const adobe::dictionary_t& parameters)
  {
  	// The view_proxy_t will be owned by Eve. We are only interested in deleting the proxy object.
***************
*** 3121,3127 ****
  /****************************************************************************************************/
  
! boost::any client_assembler(adobe::assemblage_t& assemblage, adobe::eve_t& eve, mac_token_t& token, const boost::any& parent, adobe::name_t class_name, const adobe::dictionary_t& arguments)
  {
!  	typedef boost::any (*proxy_maker_t)(adobe::assemblage_t& assemblage, adobe::eve_t& eve, mac_token_t& token, const boost::any& parent, const adobe::dictionary_t& parameters);
  	typedef std::pair<adobe::name_t, proxy_maker_t> 	maker_t;
  
--- 3099,3105 ----
  /****************************************************************************************************/
  
! boost::any client_assembler(adobe::assemblage_t& assemblage, adobe::eve_t& eve, adobe::factory_token_t& token, const boost::any& parent, adobe::name_t class_name, const adobe::dictionary_t& arguments)
  {
!  	typedef boost::any (*proxy_maker_t)(adobe::assemblage_t& assemblage, adobe::eve_t& eve, adobe::factory_token_t& token, const boost::any& parent, const adobe::dictionary_t& parameters);
  	typedef std::pair<adobe::name_t, proxy_maker_t> 	maker_t;
  
***************
*** 3316,3320 ****
  	
  	adobe::eve_t*						result_eve(new adobe::eve_t());
! 	mac_token_t							token(sheet, *result_eve, result->assemblage_m, *result.get(), notifier, dialog_size);
  	
  	adobe::eve::parse(stream, adobe::line_position_t(file_name), adobe::eve::position_t(),
--- 3294,3298 ----
  	
  	adobe::eve_t*						result_eve(new adobe::eve_t());
! 	adobe::factory_token_t		token(adobe::get_main_display(), result->assemblage_m, *result_eve, sheet, notifier, result->widget_stream_m, dialog_size);
  	
  	adobe::eve::parse(stream, adobe::line_position_t(file_name), adobe::eve::position_t(),