[adobe-source-commits] sandbox/visual_refactor/adobe/test/visual/sources client_assembler.cpp,1.8,1.9 express_viewer.cpp,1.1,1.2

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

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

Modified Files:
	client_assembler.cpp express_viewer.cpp 
Log Message:
new xstring implementation; visual building again on Mac

Index: express_viewer.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/express_viewer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** express_viewer.cpp	18 Apr 2005 21:16:05 -0000	1.1
--- express_viewer.cpp	22 Apr 2005 23:02:32 -0000	1.2
***************
*** 16,19 ****
--- 16,21 ----
  #include <adobe/xstr.hpp>
  
+ #include "factory.hpp"
+ 
  #ifndef NDEBUG
  	#include <iostream>
***************
*** 132,136 ****
  				&simpleApplication::_editor_op,
  				this, _1, _2 ),
! 			size_small_s ).release() );
  
  	//
--- 134,139 ----
  				&simpleApplication::_editor_op,
  				this, _1, _2 ),
! 			size_small_s,
! 			default_factory ).release() );
  
  	//
***************
*** 144,149 ****
  	//
  	editor_sheet_s.update();
! 	editor_view_s->window_m->set_visible( true );
! 	editor_view_s->window_m->draw_controls();
  
  #elif ADOBE_PLATFORM_WIN
--- 147,151 ----
  	//
  	editor_sheet_s.update();
! 	editor_view_s->show_window_m();
  
  #elif ADOBE_PLATFORM_WIN
***************
*** 296,309 ****
  void simpleApplication::_load_metrics_glossary()
  {
! 	adobe::dictionary_t	default_context(adobe::xstr_t::get_default_context());
  
! 	default_context.write()[adobe::static_name_t("theme")] = adobe::value_t(adobe::static_name_t("normal"));
  
! 	adobe::xstr_t::set_default_context(default_context);
  
! 	std::ifstream		metrics_glossary( ( _resource_dir_m / "metrics_glossary.xstr" ).native_file_string().c_str() );
! 	std::string			glossary(stream_sucker(metrics_glossary));
  
! 	adobe::xstr_t::assign_glossary(std::make_pair(&glossary[0], &glossary[0] + glossary.size()));
  }
  #endif
--- 298,310 ----
  void simpleApplication::_load_metrics_glossary()
  {
! 	attribute_set_t				widget_context;
  
! 	widget_context.push_back(std::make_pair(adobe::static_name_t("theme"), adobe::static_name_t("normal")));
  
! 	adobe::xstring_context_t	local_context(widget_context);
  
! 	std::ifstream metrics_glossary( ( _resource_dir_m / "metrics_glossary.xstr" ).native_file_string().c_str() );
  
! 	adobe::xstring_glossary(metrics_glossary);
  }
  #endif

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/client_assembler.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** client_assembler.cpp	22 Apr 2005 21:42:06 -0000	1.8
--- client_assembler.cpp	22 Apr 2005 23:02:32 -0000	1.9
***************
*** 985,989 ****
  	//
  	typedef 	int	widget_type_t;
! 	explicit column_proxy_t(const adobe::dictionary_t& parameters, const adobe::factory_token_t& token, const adobe::widget_node_t& parent) :
  		client_proxy_t(parameters), control_m(0)
  	{
--- 985,989 ----
  	//
  	typedef 	int	widget_type_t;
! 	explicit column_proxy_t(const adobe::dictionary_t& parameters, const adobe::factory_token_t&, const adobe::widget_node_t& parent) :
  		client_proxy_t(parameters), control_m(0)
  	{
***************
*** 1018,1022 ****
  	//
  	typedef		int	widget_type_t;
! 	explicit row_proxy_t(const adobe::dictionary_t& parameters, const adobe::factory_token_t& token, const adobe::widget_node_t& parent) :
  		client_proxy_t(parameters), control_m(0)
  	{
--- 1018,1022 ----
  	//
  	typedef		int	widget_type_t;
! 	explicit row_proxy_t(const adobe::dictionary_t& parameters, const adobe::factory_token_t&, const adobe::widget_node_t& parent) :
  		client_proxy_t(parameters), control_m(0)
  	{
***************
*** 1049,1053 ****
  
  	typedef		int	widget_type_t;
! 	explicit overlay_proxy_t(const adobe::dictionary_t& parameters, const adobe::factory_token_t& token, const adobe::widget_node_t& parent) :
  		client_proxy_t(parameters), control_m(0)
  	{
--- 1049,1053 ----
  
  	typedef		int	widget_type_t;
! 	explicit overlay_proxy_t(const adobe::dictionary_t& parameters, const adobe::factory_token_t&, const adobe::widget_node_t& parent) :
  		client_proxy_t(parameters), control_m(0)
  	{
***************
*** 3463,3476 ****
  /****************************************************************************************************/
  
! adobe::auto_ptr<eve_client_holder> make_view(	const char*			file_name,
! 						adobe::sheet_t&			sheet,
! 						const button_notifier_t&	notifier,
! 						size_enum_t			dialog_size,
! 						adobe::widget_factory_proc_t	factory)
  {
! 	std::ifstream				stream(file_name);
  	adobe::auto_ptr<eve_client_holder>	result(new eve_client_holder());
! 	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, result->show_window_m);
  	//
  	// We set the initial parent to be the root of the main display, an
--- 3463,3476 ----
  /****************************************************************************************************/
  
! adobe::auto_ptr<eve_client_holder> make_view(	const char*						file_name,
! 												adobe::sheet_t&					sheet,
! 												const button_notifier_t&		notifier,
! 												size_enum_t						dialog_size,
! 												adobe::widget_factory_proc_t	factory)
  {
! 	std::ifstream						stream(file_name);
  	adobe::auto_ptr<eve_client_holder>	result(new eve_client_holder());
! 	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, result->show_window_m);
  	//
  	// We set the initial parent to be the root of the main display, an