[adobe-source-commits] sandbox/visual_refactor/adobe/test/visual/sources client_assembler.cpp,1.1,1.2 ui_core.cpp,1.1,1.2 ui_core_common.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-serv32418/adobe/test/visual/sources

Modified Files:
	client_assembler.cpp ui_core.cpp ui_core_common.cpp 
Log Message:
rectangle now extents; started work on the ui_core, client_assembler API cleanup

Index: ui_core_common.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/ui_core_common.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ui_core_common.cpp	18 Apr 2005 21:16:05 -0000	1.1
--- ui_core_common.cpp	19 Apr 2005 17:55:59 -0000	1.2
***************
*** 17,21 ****
  /****************************************************************************************************/
  
! void align_slices(::adobe::rectangle_t::slice_t& slice_one, ::adobe::rectangle_t::slice_t slice_two)
  {
  	//
--- 17,21 ----
  /****************************************************************************************************/
  
! void align_slices(::adobe::extents_t::slice_t& slice_one, ::adobe::extents_t::slice_t slice_two)
  {
  	//

Index: ui_core.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/ui_core.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ui_core.cpp	18 Apr 2005 21:16:05 -0000	1.1
--- ui_core.cpp	19 Apr 2005 17:55:59 -0000	1.2
***************
*** 125,129 ****
  }
  
! void window_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 125,129 ----
  }
  
! void window_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 162,169 ****
  	{ object_m->initialize(initial_bounds_g, name); }
  
! rectangle_t group_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void group_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 162,169 ----
  	{ object_m->initialize(initial_bounds_g, name); }
  
! extents_t group_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void group_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 208,215 ****
  	{ object_m->initialize(initial_bounds_g, first, last); }
  
! rectangle_t tab_group_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void tab_group_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 208,215 ----
  	{ object_m->initialize(initial_bounds_g, first, last); }
  
! extents_t tab_group_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void tab_group_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 257,261 ****
  	{ object_m->initialize(initial_bounds_g); }
  
! void panel_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 257,261 ----
  	{ object_m->initialize(initial_bounds_g); }
  
! void panel_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 288,295 ****
  	{ object_m->initialize(initial_bounds_g, first, last); }
  
! rectangle_t button_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void button_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 288,295 ----
  	{ object_m->initialize(initial_bounds_g, first, last); }
  
! extents_t button_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void button_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 352,359 ****
  	{ object_m->initialize(initial_bounds_g, name); }
  
! rectangle_t radio_button_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void radio_button_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 352,359 ----
  	{ object_m->initialize(initial_bounds_g, name); }
  
! extents_t radio_button_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void radio_button_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 396,401 ****
  /****************************************************************************************************/
  
! checkbox_t::checkbox_t() :
! 	object_m(new implementation_t())
  	{ }
  
--- 396,404 ----
  /****************************************************************************************************/
  
! checkbox_t::checkbox_t(	const std::string&	name,
! 						adobe::value_t		true_value,
! 						adobe::value_t		false_value,
! 						theme_t				theme) :
! 	object_m(new implementation_t(name, true_value, false_value, theme))
  	{ }
  
***************
*** 407,446 ****
  	{ delete object_m; }
  
! void checkbox_t::initialize(const std::string& name)
! 	{ object_m->initialize(initial_bounds_g, name); }
! 
! rectangle_t checkbox_t::best_bounds()
! 	{ return object_m->best_bounds(); }
! 
! void checkbox_t::set_bounds(const point_t& position, const rectangle_t& geometry)
! 	{ object_m->set_bounds(position, geometry); }
! 
! void checkbox_t::set_name(const std::string& name)
! 	{ object_m->set_name(name); }
! 
! void checkbox_t::set_theme(theme_t theme)
! 	{ object_m->set_theme(theme); }
! 
! void checkbox_t::adorn_theme(theme_t theme)
! 	{ object_m->adorn_theme(theme); }
  
! void checkbox_t::unadorn_theme(theme_t theme)
! 	{ object_m->unadorn_theme(theme); }
  
  void checkbox_t::set_active(bool active)
  	{ return object_m->set_active(active); }
  
! void checkbox_t::set_visible(bool make_visible)
! 	{ object_m->set_visible(make_visible); }
! 
! void checkbox_t::set_focused(bool make_focused)
! 	{ object_m->set_focused(make_focused); }
! 
! void checkbox_t::set_value(bool value)
  	{ object_m->set_value(value); }
  
- void checkbox_t::signal_focus(implementation::control_focus_proc_t proc)
- 	{ return object_m->signal_focus(proc); }
- 
  void checkbox_t::signal_hit(implementation::checkbox_hit_proc_t proc)
  	{ return object_m->signal_hit(proc); }
--- 410,425 ----
  	{ delete object_m; }
  
! extents_t checkbox_t::measure()
! 	{ return object_m->measure(); }
  
! void checkbox_t::set_bounds(const point_2d_t& position, const extents_t& extents)
! 	{ object_m->set_bounds(position, extents); }
  
  void checkbox_t::set_active(bool active)
  	{ return object_m->set_active(active); }
  
! void checkbox_t::set_value(adobe::value_t value)
  	{ object_m->set_value(value); }
  
  void checkbox_t::signal_hit(implementation::checkbox_hit_proc_t proc)
  	{ return object_m->signal_hit(proc); }
***************
*** 468,475 ****
  	{ object_m->initialize(initial_bounds_g); }
  
! rectangle_t link_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void link_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 447,454 ----
  	{ object_m->initialize(initial_bounds_g); }
  
! extents_t link_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void link_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 517,524 ****
  	{ object_m->initialize(initial_bounds_g, bar_style, is_vertical); }
  
! rectangle_t progress_bar_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void progress_bar_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 496,503 ----
  	{ object_m->initialize(initial_bounds_g, bar_style, is_vertical); }
  
! extents_t progress_bar_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void progress_bar_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 569,576 ****
  	{ object_m->initialize(initial_bounds_g); }
  
! rectangle_t separator_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void separator_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 548,555 ----
  	{ object_m->initialize(initial_bounds_g); }
  
! extents_t separator_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void separator_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 600,607 ****
  	{ object_m->initialize(initial_bounds_g, name); }
  
! rectangle_t static_text_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void static_text_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 579,586 ----
  	{ object_m->initialize(initial_bounds_g, name); }
  
! extents_t static_text_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void static_text_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 655,662 ****
  	{ object_m->initialize(initial_bounds_g, name, scrollable, cols, rows); }
  
! rectangle_t edit_text_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void edit_text_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 634,641 ----
  	{ object_m->initialize(initial_bounds_g, name, scrollable, cols, rows); }
  
! extents_t edit_text_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void edit_text_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 725,732 ****
  	{ object_m->initialize(initial_bounds_g, name); }
  
! rectangle_t popup_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void popup_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 704,711 ----
  	{ object_m->initialize(initial_bounds_g, name); }
  
! extents_t popup_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void popup_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 795,802 ****
  	{ object_m->initialize(initial_bounds_g, name, using_popup, cols, rows); }
  
! rectangle_t unit_edit_text_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void unit_edit_text_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 774,781 ----
  	{ object_m->initialize(initial_bounds_g, name, using_popup, cols, rows); }
  
! extents_t unit_edit_text_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void unit_edit_text_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 874,881 ****
  	{ object_m->initialize(0, is_vertical, style, num_tick_marks); }
  
! rectangle_t slider_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void slider_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 853,860 ----
  	{ object_m->initialize(0, is_vertical, style, num_tick_marks); }
  
! extents_t slider_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void slider_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 935,942 ****
  	{ object_m->initialize(initial_bounds_g, name, offset_contents, menu_points_right); }
  
! rectangle_t bevel_button_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void bevel_button_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 914,921 ----
  	{ object_m->initialize(initial_bounds_g, name, offset_contents, menu_points_right); }
  
! extents_t bevel_button_t::best_bounds()
  	{ return object_m->best_bounds(); }
  
! void bevel_button_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 1009,1013 ****
  	{ object_m->initialize(initial_bounds_g, window.implementation().window_m); }
  
! void hitless_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
--- 988,992 ----
  	{ object_m->initialize(initial_bounds_g, window.implementation().window_m); }
  
! void hitless_t::set_bounds(const point_2d_t& position, const extents_t& geometry)
  	{ object_m->set_bounds(position, geometry); }
  
***************
*** 1023,1031 ****
  #if defined(ADOBE_SERIALIZATION)
  
! 	#define	ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(type)	\
  	bool operator == (const type& x, const type& y)							\
  		{ return *x.object_m == *y.object_m; }								\
- 	bool operator < (const type& /*x*/, const type& /*y*/)					\
- 		{ return false; /*REVISIT (fbrereto) : What does this really mean?*/ /*x.object_m->essentials() < y.object_m->essentials();*/ }	\
  	std::ostream& operator << (std::ostream& s, const type& x)				\
  		{ return s << *x.object_m; }
--- 1002,1008 ----
  #if defined(ADOBE_SERIALIZATION)
  
! 	#define	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(type)	\
  	bool operator == (const type& x, const type& y)							\
  		{ return *x.object_m == *y.object_m; }								\
  	std::ostream& operator << (std::ostream& s, const type& x)				\
  		{ return s << *x.object_m; }
***************
*** 1033,1062 ****
  #else
  
! 	#define	ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(type)	\
  	bool operator == (const type& x, const type& y)							\
! 		{ return *x.object_m == *y.object_m; }								\
! 	bool operator < (const type& /*x*/, const type& /*y*/)					\
! 		{ return false; /*REVISIT (fbrereto) : What does this really mean?*/ /*x.object_m->essentials() < y.object_m->essentials();*/ }
  
  #endif
  
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::window_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::group_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::tab_group_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::button_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::panel_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::radio_button_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::checkbox_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::link_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::progress_bar_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::separator_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::static_text_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::edit_text_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::popup_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::unit_edit_text_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::slider_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::bevel_button_t);
  #ifndef NDEBUG
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::hitless_t);
  #endif // NDEBUG
  
--- 1010,1037 ----
  #else
  
! 	#define	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(type)	\
  	bool operator == (const type& x, const type& y)							\
! 		{ return *x.object_m == *y.object_m; }
  
  #endif
  
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::window_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::group_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::tab_group_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::button_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::panel_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::radio_button_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::checkbox_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::link_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::progress_bar_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::separator_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::static_text_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::edit_text_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::popup_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::unit_edit_text_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::slider_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::bevel_button_t);
  #ifndef NDEBUG
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::hitless_t);
  #endif // NDEBUG
  

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/client_assembler.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** client_assembler.cpp	18 Apr 2005 21:16:05 -0000	1.1
--- client_assembler.cpp	19 Apr 2005 17:55:57 -0000	1.2
***************
*** 287,292 ****
  	std::string						name_m;
  	std::string						tooltip_m;
! 	adobe::name_t						identifier_m;
! 	adobe::name_t						class_m;
  
  	adobe::eve_t::iterator			eve_token_m;
--- 287,292 ----
  	std::string						name_m;
  	std::string						tooltip_m;
! 	adobe::name_t					identifier_m;
! 	adobe::name_t					class_m;
  
  	adobe::eve_t::iterator			eve_token_m;
***************
*** 294,301 ****
  	// These items are used to bind the view to an adam sheet
  	
! 	adobe::name_t						bind_m;
! 	adobe::name_t						bind_indirect_m;
  	std::vector<adobe::name_t>		touch_set_m;
! 	adobe::name_t						focus_m;
  	adobe::sheet_t*					sheet_m;
  	adobe::assemblage_t*			assemblage_m;
--- 294,301 ----
  	// These items are used to bind the view to an adam sheet
  	
! 	adobe::name_t					bind_m;
! 	adobe::name_t					bind_indirect_m;
  	std::vector<adobe::name_t>		touch_set_m;
! 	adobe::name_t					focus_m;
  	adobe::sheet_t*					sheet_m;
  	adobe::assemblage_t*			assemblage_m;
***************
*** 309,313 ****
  /****************************************************************************************************/
  
! struct dialog_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	dialog_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 309,313 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 330,334 ****
  /****************************************************************************************************/
  
! struct palette_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	palette_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 330,334 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 346,350 ****
  /****************************************************************************************************/
  
! struct group_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 346,350 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 366,370 ****
  /****************************************************************************************************/
  
! struct tab_group_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	tab_group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 366,370 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 389,393 ****
  /****************************************************************************************************/
  
! struct panel_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	panel_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 389,393 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 408,412 ****
  /****************************************************************************************************/
  
! struct separator_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	separator_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 408,412 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 482,486 ****
  /****************************************************************************************************/
  
! struct button_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 482,486 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 522,526 ****
  /****************************************************************************************************/
  
! struct popup_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	popup_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 522,526 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 541,545 ****
  /****************************************************************************************************/
  
! struct link_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	link_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 541,545 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 564,568 ****
  /****************************************************************************************************/
  
! struct checkbox_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	checkbox_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 564,568 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 572,580 ****
  
   private:
! 	void		value_changed(adobe::modifiers_t, std::size_t new_value);
  
   	void		monitor_value(const adobe::value_t&);
!  	
!  	std::size_t			last_m; // debounce
   	adobe::checkbox_t	control_m;
  };
--- 572,580 ----
  
   private:
! 	void		value_changed(adobe::value_t new_value);
  
   	void		monitor_value(const adobe::value_t&);
! 
!  	adobe::value_t		last_m;
   	adobe::checkbox_t	control_m;
  };
***************
*** 582,586 ****
  /****************************************************************************************************/
  
! struct radio_button_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	radio_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 582,586 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 610,614 ****
  
  template <bevel_emulation_t emulation>
! struct bevel_button_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	bevel_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 610,614 ----
  
  template <bevel_emulation_t emulation>
! 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*);
***************
*** 647,651 ****
  /****************************************************************************************************/
  
! struct progress_bar_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	progress_bar_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 647,651 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 665,669 ****
  /****************************************************************************************************/
  
! struct static_text_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	static_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 665,669 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 680,684 ****
  /****************************************************************************************************/
  
! struct edit_number_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	edit_number_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 680,684 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 739,743 ****
  /****************************************************************************************************/
  
! struct slider_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	slider_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 739,743 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 761,765 ****
  /****************************************************************************************************/
  
! struct edit_text_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit	edit_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*);
--- 761,765 ----
  /****************************************************************************************************/
  
! 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*);
***************
*** 792,795 ****
--- 792,806 ----
  /****************************************************************************************************/
  
+ adobe::theme_t size_to_theme(size_enum_t size)
+ {
+ 	adobe::theme_t					theme = adobe::theme_normal_s;
+ 	if (size == size_small_s)		theme = adobe::theme_small_s;
+ 	else if (size == size_mini_s)	theme = adobe::theme_mini_s;
+ 
+ 	return theme;
+ }
+ 
+ /****************************************************************************************************/
+ 
  #if defined(ADOBE_SERIALIZATION)
  template <typename Widget>
***************
*** 807,815 ****
  	local.size_m = parent.size_m;
  
! 	adobe::theme_t							control_theme = adobe::theme_normal_s;
! 	if (local.size_m == size_small_s)		control_theme = adobe::theme_small_s; 
! 	else if (local.size_m == size_mini_s)	control_theme = adobe::theme_mini_s; 
! 
! 	adobe::ui_core_interface::adorn_theme(control, control_theme);
  
  	local.display_token_m = adobe::insert(adobe::get_main_display(), parent.display_token_m, control);
--- 818,822 ----
  	local.size_m = parent.size_m;
  
! 	adobe::ui_core_interface::adorn_theme(control, size_to_theme(local.size_m));
  
  	local.display_token_m = adobe::insert(adobe::get_main_display(), parent.display_token_m, control);
***************
*** 852,856 ****
  /****************************************************************************************************/
  
! typedef	std::pair<adobe::point_t, adobe::rectangle_t>	place_converter_result_t;
  
  /****************************************************************************************************/
--- 859,863 ----
  /****************************************************************************************************/
  
! typedef	std::pair<adobe::point_2d_t, adobe::extents_t>	place_converter_result_t;
  
  /****************************************************************************************************/
***************
*** 860,872 ****
  /****************************************************************************************************/
  
! void place_data_convert_slice(const adobe::eve_t::place_data_t& data, place_converter_result_t& result, adobe::rectangle_slices_t::slice_select_t slice)
  {
! 	const adobe::eve_t::place_data_t::slice_t&			src_slice(data.slice_m[slice]);
! 	adobe::rectangle_t::slice_t&						dst_slice(result.second.slice_m[slice]);
  
! 	if (slice == adobe::rectangle_slices_t::horizontal)
! 		result.first.first = src_slice.position_m;
  	else
! 		result.first.second = src_slice.position_m;
  
  	dst_slice.length_m = src_slice.length_m;
--- 867,879 ----
  /****************************************************************************************************/
  
! void place_data_convert_slice(const adobe::eve_t::place_data_t& data, place_converter_result_t& result, adobe::extents_slices_t::slice_select_t slice)
  {
! 	const adobe::eve_t::place_data_t::slice_t&		src_slice(data.slice_m[slice]);
! 	adobe::extents_t::slice_t&						dst_slice(result.second.slice_m[slice]);
  
! 	if (slice == adobe::extents_slices_t::horizontal)
! 		result.first.x_m = src_slice.position_m;
  	else
! 		result.first.y_m = src_slice.position_m;
  
  	dst_slice.length_m = src_slice.length_m;
***************
*** 874,885 ****
  	dst_slice.outset_m = src_slice.outset_m;
  
! 	adobe::copy(src_slice.guides_m, std::back_inserter(dst_slice.poi_m));
  }
  
  /****************************************************************************************************/
  
! void best_bounds_data_convert_slice(const adobe::rectangle_t& ideal, adobe::eve_t::calculate_data_t& result, adobe::rectangle_slices_t::slice_select_t slice)
  {
! 	const adobe::rectangle_t::slice_t&			src_slice(ideal.slice_m[slice]);
  	adobe::eve_t::calculate_data_t::slice_t&	dst_slice(result.slice_m[slice]);
  
--- 881,892 ----
  	dst_slice.outset_m = src_slice.outset_m;
  
! 	adobe::copy(src_slice.guide_set_m, std::back_inserter(dst_slice.poi_m));
  }
  
  /****************************************************************************************************/
  
! void best_bounds_data_convert_slice(const adobe::extents_t& ideal, adobe::eve_t::calculate_data_t& result, adobe::extents_slices_t::slice_select_t slice)
  {
! 	const adobe::extents_t::slice_t&			src_slice(ideal.slice_m[slice]);
  	adobe::eve_t::calculate_data_t::slice_t&	dst_slice(result.slice_m[slice]);
  
***************
*** 889,893 ****
  	dst_slice.frame_m = src_slice.frame_m;
  
! 	adobe::copy(src_slice.poi_m, std::back_inserter(dst_slice.guides_m));
  }
  
--- 896,900 ----
  	dst_slice.frame_m = src_slice.frame_m;
  
! 	adobe::copy(src_slice.poi_m, std::back_inserter(dst_slice.guide_set_m));
  }
  
***************
*** 902,907 ****
  	place_converter_result_t result;
  
! 	implementation::place_data_convert_slice(data, result, adobe::rectangle_slices_t::horizontal);
! 	implementation::place_data_convert_slice(data, result, adobe::rectangle_slices_t::vertical);
  
  	return result;
--- 909,914 ----
  	place_converter_result_t result;
  
! 	implementation::place_data_convert_slice(data, result, adobe::extents_slices_t::horizontal);
! 	implementation::place_data_convert_slice(data, result, adobe::extents_slices_t::vertical);
  
  	return result;
***************
*** 910,917 ****
  /****************************************************************************************************/
  
! adobe::eve_t::calculate_data_t best_bounds_data_converter(const adobe::rectangle_t& ideal, adobe::eve_t::calculate_data_t& result)
  {
! 	implementation::best_bounds_data_convert_slice(ideal, result, adobe::rectangle_slices_t::horizontal);
! 	implementation::best_bounds_data_convert_slice(ideal, result, adobe::rectangle_slices_t::vertical);
  
  	return result;
--- 917,924 ----
  /****************************************************************************************************/
  
! adobe::eve_t::calculate_data_t measure_extents_converter(const adobe::extents_t& ideal, adobe::eve_t::calculate_data_t& result)
  {
! 	implementation::best_bounds_data_convert_slice(ideal, result, adobe::extents_slices_t::horizontal);
! 	implementation::best_bounds_data_convert_slice(ideal, result, adobe::extents_slices_t::vertical);
  
  	return result;
***************
*** 937,941 ****
  		place_converter_result_t conv(place_data_converter(data));
  
! 		adobe::frame_geometry(window_m, conv.first, conv.second);
  	}
  
--- 944,948 ----
  		place_converter_result_t conv(place_data_converter(data));
  
! 		adobe::frame_extents(window_m, conv.first, conv.second);
  	}
  
***************
*** 959,963 ****
  */
  
! struct column_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit column_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) :
--- 966,970 ----
  */
  
! 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) :
***************
*** 987,991 ****
  }
  	
! struct row_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit row_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) :
--- 994,998 ----
  }
  	
! 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) :
***************
*** 1015,1019 ****
  }
  
! struct overlay_proxy_t : client_proxy_t, adobe::rectangle_slices_t
  {
  	explicit overlay_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) :
--- 1022,1026 ----
  }
  
! 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) :
***************
*** 1063,1068 ****
  /****************************************************************************************************/
  
! template <class T, class U>
! void calculate(T& t, U& u)
  {
  	t.calculate(u);
--- 1070,1075 ----
  /****************************************************************************************************/
  
! template <class T>
! void calculate(T& t, adobe::eve_t::calculate_data_t& u)
  {
  	t.calculate(u);
***************
*** 1071,1095 ****
  /****************************************************************************************************/
  
! template <> void calculate<row_proxy_t, adobe::eve_t::calculate_data_t>(row_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<column_proxy_t, adobe::eve_t::calculate_data_t>(column_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<overlay_proxy_t, adobe::eve_t::calculate_data_t>(overlay_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<dialog_proxy_t, adobe::eve_t::calculate_data_t>(dialog_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<palette_proxy_t, adobe::eve_t::calculate_data_t>(palette_proxy_t&, adobe::eve_t::calculate_data_t&) { }
  
  /****************************************************************************************************/
  
  template <>
! void calculate<button_proxy_t, adobe::eve_t::calculate_data_t>(button_proxy_t& button, adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(button.button_m.best_bounds(), geometry);
  
! 	geometry.slice_m[adobe::rectangle_slices_t::horizontal].length_m =
! 		std::max<long>(button_width, geometry.slice_m[adobe::rectangle_slices_t::horizontal].length_m);
  }
  
  /****************************************************************************************************/
  
! template <class T, class U, class V>
! void calculate_vertical(T&, U&, V&)
  { }
  
--- 1078,1102 ----
  /****************************************************************************************************/
  
! template <> void calculate<row_proxy_t>(row_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<column_proxy_t>(column_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<overlay_proxy_t>(overlay_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<dialog_proxy_t>(dialog_proxy_t&, adobe::eve_t::calculate_data_t&) { }
! template <> void calculate<palette_proxy_t>(palette_proxy_t&, adobe::eve_t::calculate_data_t&) { }
  
  /****************************************************************************************************/
  
  template <>
! void calculate<button_proxy_t>(button_proxy_t& button, adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(button.button_m.best_bounds(), geometry);
  
! 	geometry.slice_m[adobe::extents_slices_t::horizontal].length_m =
! 		std::max<long>(button_width, geometry.slice_m[adobe::extents_slices_t::horizontal].length_m);
  }
  
  /****************************************************************************************************/
  
! template <class T>
! void calculate_vertical(T&, adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&)
  { }
  
***************
*** 1097,1101 ****
  
  template <>
! void calculate_vertical<static_text_proxy_t, adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>
  	(static_text_proxy_t& t, adobe::eve_t::calculate_data_t& u, const adobe::eve_t::place_data_t& v)
  {
--- 1104,1108 ----
  
  template <>
! void calculate_vertical<static_text_proxy_t>
  	(static_text_proxy_t& t, adobe::eve_t::calculate_data_t& u, const adobe::eve_t::place_data_t& v)
  {
***************
*** 1105,1110 ****
  /****************************************************************************************************/
  
! template <class T, class U, class V>
! void place(T& t, U& u, V& v)
  {
  	t.place(u, v);
--- 1112,1117 ----
  /****************************************************************************************************/
  
! template <class T>
! void place(T& t, const adobe::eve_t::calculate_data_t& u, const adobe::eve_t::place_data_t& v)
  {
  	t.place(u, v);
***************
*** 1113,1119 ****
  /****************************************************************************************************/
  
! template <> void place<row_proxy_t, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>(row_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { }
! template <> void place<column_proxy_t, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>(column_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { }
! template <> void place<overlay_proxy_t, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>(overlay_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { }
  
  /****************************************************************************************************/
--- 1120,1126 ----
  /****************************************************************************************************/
  
! template <> void place<row_proxy_t>(row_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { }
! template <> void place<column_proxy_t>(column_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { }
! template <> void place<overlay_proxy_t>(overlay_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { }
  
  /****************************************************************************************************/
***************
*** 1137,1140 ****
--- 1144,1148 ----
  template <> void adorn_theme<adobe::panel_t>(adobe::panel_t&, adobe::theme_t){ }
  template <> void adorn_theme<adobe::separator_t>(adobe::separator_t&, adobe::theme_t){ }
+ template <> void adorn_theme<adobe::checkbox_t>(adobe::checkbox_t&, adobe::theme_t){ }
  
  /****************************************************************************************************/
***************
*** 1389,1393 ****
  void bevel_button_proxy_t<emulation>::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  
  	if (emul_popup && popup_bind_m && items_m.size())
--- 1397,1401 ----
  void bevel_button_proxy_t<emulation>::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  
  	if (emul_popup && popup_bind_m && items_m.size())
***************
*** 1472,1476 ****
  void progress_bar_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(progress_bar_m.best_bounds(), geometry);
  }
  
--- 1480,1484 ----
  void progress_bar_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(progress_bar_m.best_bounds(), geometry);
  }
  
***************
*** 1511,1515 ****
  void static_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	adobe::rectangle_t ideal(static_m.best_bounds());
  
  	if (wrap_m)
--- 1519,1523 ----
  void static_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	adobe::extents_t ideal(static_m.best_bounds());
  
  	if (wrap_m)
***************
*** 1523,1527 ****
  
  		adobe::copy(ideal.slice_m[vertical].poi_m,
! 					std::back_inserter<adobe::points_of_interest_t>(geometry.slice_m[vertical].guides_m));
  	}
  }
--- 1531,1535 ----
  
  		adobe::copy(ideal.slice_m[vertical].poi_m,
! 					std::back_inserter<adobe::guide_set_t>(geometry.slice_m[vertical].guide_set_m));
  	}
  }
***************
*** 1662,1666 ****
  void edit_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 1670,1674 ----
  void edit_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  }
  
***************
*** 1766,1770 ****
  void slider_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 1774,1778 ----
  void slider_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  }
  
***************
*** 2067,2071 ****
  void edit_number_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 2075,2079 ----
  void edit_number_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  }
  
***************
*** 2126,2130 ****
  void group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 2134,2138 ----
  void group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  }
  
***************
*** 2254,2258 ****
  void tab_group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 2262,2266 ----
  void tab_group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  }
  
***************
*** 2580,2584 ****
  void popup_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 2588,2592 ----
  void popup_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  }
  
***************
*** 2652,2656 ****
  
  	for (std::size_t i(0); i < count_m; ++i)
! 		geometry.slice_m[vertical].guides_m.push_back(2);
  }
  
--- 2660,2664 ----
  
  	for (std::size_t i(0); i < count_m; ++i)
! 		geometry.slice_m[vertical].guide_set_m.push_back(2);
  }
  
***************
*** 2720,2724 ****
  void radio_button_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 2728,2732 ----
  void radio_button_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.best_bounds(), geometry);
  }
  
***************
*** 2744,2753 ****
  									client_proxy_t*				parent) :
  	client_proxy_t(parameters),
  	last_m(0)
  {
  	sheet_m = &token.sheet_m;
  
- 	control_m.initialize(name_m);
- 
  	set_up_control(*this, control_m, *parent, token);
  	
--- 2752,2760 ----
  									client_proxy_t*				parent) :
  	client_proxy_t(parameters),
+ 	control_m(name_m, adobe::value_t(true), adobe::value_t(false), size_to_theme(parent->size_m)),
  	last_m(0)
  {
  	sheet_m = &token.sheet_m;
  
  	set_up_control(*this, control_m, *parent, token);
  	
***************
*** 2757,2761 ****
  		token.assemblage_m.hold_connection(sheet_m->monitor_active(bind_m, boost::bind(&adobe::checkbox_t::set_active, boost::ref(control_m), _1)));
  
! 		control_m.signal_hit(boost::bind(&checkbox_proxy_t::value_changed, boost::ref(*this), _1, _2));
  	}
  }
--- 2764,2768 ----
  		token.assemblage_m.hold_connection(sheet_m->monitor_active(bind_m, boost::bind(&adobe::checkbox_t::set_active, boost::ref(control_m), _1)));
  
! 		control_m.signal_hit(boost::bind(&checkbox_proxy_t::value_changed, boost::ref(*this), _1));
  	}
  }
***************
*** 2763,2773 ****
  /****************************************************************************************************/
  
! void checkbox_proxy_t::value_changed(adobe::modifiers_t, std::size_t new_value)
  {
  	if (new_value == last_m) return;
  
  	last_m = new_value;
  	touch();
! 	sheet_m->set(bind_m, adobe::value_t(bool(last_m)));
  	sheet_m->update();
  }
--- 2770,2782 ----
  /****************************************************************************************************/
  
! void checkbox_proxy_t::value_changed(adobe::value_t new_value)
  {
  	if (new_value == last_m) return;
  
  	last_m = new_value;
+ 
  	touch();
! 
! 	sheet_m->set(bind_m, new_value);
  	sheet_m->update();
  }
***************
*** 2777,2781 ****
  void checkbox_proxy_t::monitor_value(const adobe::value_t& value)
  {
! 	last_m = value.get<bool>(); // should this be a tribool (or something that can represent it)?
  
  	control_m.set_value(last_m);
--- 2786,2790 ----
  void checkbox_proxy_t::monitor_value(const adobe::value_t& value)
  {
! 	last_m = value;
  
  	control_m.set_value(last_m);
***************
*** 2786,2790 ****
  void checkbox_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	best_bounds_data_converter(control_m.best_bounds(), geometry);
  }
  
--- 2795,2799 ----
  void checkbox_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry)
  {
! 	measure_extents_converter(control_m.measure(), geometry);
  }
  
***************
*** 2794,2798 ****
  {
  	place_converter_result_t conv(place_data_converter(data));
! 
  	control_m.set_bounds(conv.first, conv.second);
  }
--- 2803,2809 ----
  {
  	place_converter_result_t conv(place_data_converter(data));
! #if 0
! 	adobe::point_2d_t size(conv.second.width(), conv.second.height());
! #endif
  	control_m.set_bounds(conv.first, conv.second);
  }
***************
*** 2869,2873 ****
  
  #ifndef NDEBUG
! 	if (adobe::clear_geometry_frames(window_m))
  		layout_m->do_framing();
  #endif
--- 2880,2884 ----
  
  #ifndef NDEBUG
! 	if (adobe::clear_extents_frames(window_m))
  		layout_m->do_framing();
  #endif
***************
*** 2884,2888 ****
  	place_converter_result_t conv(place_data_converter(data));
  
! 	window_m.set_bounds(adobe::point_t(), conv.second);
  	window_m.reposition(adobe::window_reposition_center_s);
  }
--- 2895,2899 ----
  	place_converter_result_t conv(place_data_converter(data));
  
! 	window_m.set_bounds(adobe::point_2d_t(), conv.second);
  	window_m.reposition(adobe::window_reposition_center_s);
  }
***************
*** 2952,2956 ****
  	place_converter_result_t conv(place_data_converter(data));
  
! 	window_m.set_bounds(adobe::point_t(), conv.second);
  
  	window_m.reposition(adobe::window_reposition_alert_s);
--- 2963,2967 ----
  	place_converter_result_t conv(place_data_converter(data));
  
! 	window_m.set_bounds(adobe::point_2d_t(), conv.second);
  
  	window_m.reposition(adobe::window_reposition_alert_s);
***************
*** 3091,3097 ****
  
  	signals.eve_container_defaults_proc_m	= optional_container_defaults<T>();
! 	signals.eve_calculate_proc_m			= boost::bind(&adobe::eve_interface::calculate<T, adobe::eve_t::calculate_data_t>, boost::ref(*new_proxy), _1);
! 	signals.eve_calculate_vertical_proc_m	= boost::bind(&adobe::eve_interface::calculate_vertical<T, adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>, boost::ref(*new_proxy), _1, _2);
! 	signals.eve_place_proc_m				= boost::bind(&adobe::eve_interface::place<T, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>, boost::ref(*new_proxy), _1, _2);
  
  	new_proxy->eve_token_m = eve.add_view_element(	parent_proxy ? parent_proxy->eve_token_m : adobe::eve_t::iterator(),
--- 3102,3108 ----
  
  	signals.eve_container_defaults_proc_m	= optional_container_defaults<T>();
! 	signals.eve_calculate_proc_m			= boost::bind(&adobe::eve_interface::calculate<T>, boost::ref(*new_proxy), _1);
! 	signals.eve_calculate_vertical_proc_m	= boost::bind(&adobe::eve_interface::calculate_vertical<T>, boost::ref(*new_proxy), _1, _2);
! 	signals.eve_place_proc_m				= boost::bind(&adobe::eve_interface::place<T>, boost::ref(*new_proxy), _1, _2);
  
  	new_proxy->eve_token_m = eve.add_view_element(	parent_proxy ? parent_proxy->eve_token_m : adobe::eve_t::iterator(),