[adobe-source-commits] adobe-source/adobe/test/visual/sources client_assembler.cpp,1.4,1.5 express_viewer.cpp,1.3,1.4 ui_core.cpp,1.3,1.4

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

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

Modified Files:
	client_assembler.cpp express_viewer.cpp ui_core.cpp 
Log Message:
asl 1.0.2

Index: express_viewer.cpp
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/visual/sources/express_viewer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** express_viewer.cpp	17 Mar 2005 18:03:18 -0000	1.3
--- express_viewer.cpp	2 Apr 2005 05:47:39 -0000	1.4
***************
*** 9,30 ****
  #include <boost/config.hpp>
  
- #ifdef BOOST_MSVC
- 	#include <windows.h>
- #else
- 	#include <Carbon/Carbon.h>
- 
- 	/*
- 		REVISIT (sparent) : Apple insists that you include the entire Carbon/Carbon.h framework to
- 		use any of Carbon. This header file #defines check which conflicts with boost. The work-
[...1258 lines suppressed...]
! 
  /****************************************************************************************************/
  
! void simpleApplication::set_resource_directory( bfs::path res_path )
  {
! 	_resource_dir_m = res_path;
! }
  
! /****************************************************************************************************/
  
! void simpleApplication::set_dialog_size( size_enum_t s )
! {
! 	_dialog_size_m = s;
  }
  
  /****************************************************************************************************/
  
! } // namespace adobe
! 
! /****************************************************************************************************/

Index: ui_core.cpp
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/visual/sources/ui_core.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ui_core.cpp	17 Mar 2005 18:03:18 -0000	1.3
--- ui_core.cpp	2 Apr 2005 05:47:39 -0000	1.4
***************
*** 20,24 ****
  
  #define ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DEFINITION(the_class)					\
! void swap(adobe::##the_class & x, adobe::##the_class & y) { std::swap(x.object_m, y.object_m); }
  
  /****************************************************************************************************/
--- 20,24 ----
  
  #define ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DEFINITION(the_class)					\
! void swap(adobe::the_class & x, adobe::the_class & y) { std::swap(x.object_m, y.object_m); }
  
  /****************************************************************************************************/

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/adobe-source/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	17 Mar 2005 23:14:29 -0000	1.4
--- client_assembler.cpp	2 Apr 2005 05:47:39 -0000	1.5
***************
*** 41,45 ****
  #include "report_exception.hpp"
  #include "display.hpp"
! #include "latch.hpp"
  
  #include <fstream>
--- 41,45 ----
  #include "report_exception.hpp"
  #include "display.hpp"
! //#include "latch.hpp"
  
  #include <fstream>
***************
*** 1312,1316 ****
  	{
  		for (adobe::array_t::const_iterator iter(items_m.begin()); iter != items_m.end(); ++iter)
! 			control_m.add_menu_item((*iter).get<adobe::dictionary_t>()[key_name].get<std::string>(), (*iter).get<adobe::dictionary_t>()[key_value]);
  
  		token.assemblage_m.hold_connection(sheet_m->monitor_value(popup_bind_m, boost::bind(&bevel_button_proxy_t<emulation>::monitor_popup_value, boost::ref(*this), _1)));
--- 1312,1316 ----
  	{
  		for (adobe::array_t::const_iterator iter(items_m.begin()); iter != items_m.end(); ++iter)
! 			control_m.add_menu_item((*iter).template get<adobe::dictionary_t>()[key_name].template get<std::string>(), (*iter).template get<adobe::dictionary_t>()[key_value]);
  
  		token.assemblage_m.hold_connection(sheet_m->monitor_value(popup_bind_m, boost::bind(&bevel_button_proxy_t<emulation>::monitor_popup_value, boost::ref(*this), _1)));
***************
*** 2397,2401 ****
  	geometry.slice_m[horizontal].length_m	= 2;
  	geometry.slice_m[vertical].length_m		= 2;
! #elif defined(__MWERKS__)
  	geometry.slice_m[horizontal].length_m	= is_vertical_m ? 5 : 6;
  	geometry.slice_m[vertical].length_m		= is_vertical_m ? 6 : 5;
--- 2397,2401 ----
  	geometry.slice_m[horizontal].length_m	= 2;
  	geometry.slice_m[vertical].length_m		= 2;
! #elif ADOBE_PLATFORM_MAC
  	geometry.slice_m[horizontal].length_m	= is_vertical_m ? 5 : 6;
  	geometry.slice_m[vertical].length_m		= is_vertical_m ? 6 : 5;
***************
*** 3265,3272 ****
  	static adobe::static_name_t ok_s			("ok");
  
! 	if (action == reset_s)			{ sheet_m.set((*window)->contributing_m); sheet_m.update(); return; }
! 	if (action == cancel_s)			{ sheet_m.set((*window)->contributing_m); erase(window); sheet_m.update(); return; }
! 	if (action == dialog_s)			{ push_back(parameter.get<std::string>().c_str(), size_normal_s); return; }
! 	if (action == ok_s)				{ erase(window); if (fallback_m) fallback_m(action, parameter); return; }
  }
  
--- 3265,3290 ----
  	static adobe::static_name_t ok_s			("ok");
  
! 	if (action == reset_s)
! 	{
! 		sheet_m.set((*window)->contributing_m);
! 		sheet_m.update();
! 	}
! 	else if (action == dialog_s)
! 	{
! 		push_back(parameter.get<std::string>().c_str(), size_normal_s);
! 	}
! 	else if (action == cancel_s)
! 	{
! 		sheet_m.set((*window)->contributing_m);
! 		erase(window);
! 		sheet_m.update();
! 	}
! 	else if (action == ok_s)
! 	{
! 		erase(window);
! 	}
! 
! 	if (fallback_m && (action == cancel_s || action == ok_s))
! 		fallback_m(action, parameter); 
  }