[adobe-source-commits] sandbox/visual_refactor/adobe/test/visual/headers client_assembler.hpp,1.1,1.2 ui_core.hpp,1.1,1.2 ui_core_common.hpp,1.1,1.2

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

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

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

Index: ui_core_common.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/ui_core_common.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ui_core_common.hpp	18 Apr 2005 21:16:03 -0000	1.1
--- ui_core_common.hpp	19 Apr 2005 17:55:56 -0000	1.2
***************
*** 12,16 ****
  /****************************************************************************************************/
  
! #include <adobe/rectangle.hpp>
  
  /****************************************************************************************************/
--- 12,16 ----
  /****************************************************************************************************/
  
! #include <adobe/extents.hpp>
  
  /****************************************************************************************************/
***************
*** 35,39 ****
  //
  
! void align_slices(::adobe::rectangle_t::slice_t& slice_one, ::adobe::rectangle_t::slice_t slice_two);
  
  /****************************************************************************************************/
--- 35,39 ----
  //
  
! void align_slices(::adobe::extents_t::slice_t& slice_one, ::adobe::extents_t::slice_t slice_two);
  
  /****************************************************************************************************/

Index: client_assembler.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/client_assembler.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** client_assembler.hpp	18 Apr 2005 21:16:03 -0000	1.1
--- client_assembler.hpp	19 Apr 2005 17:55:55 -0000	1.2
***************
*** 116,120 ****
  
  #ifndef NDEBUG
! 	void clear_frames() { if (window_m) adobe::clear_geometry_frames(*window_m); }
  #endif
  
--- 116,120 ----
  
  #ifndef NDEBUG
! 	void clear_frames() { if (window_m) adobe::clear_extents_frames(*window_m); }
  #endif
  

Index: ui_core.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/ui_core.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ui_core.hpp	18 Apr 2005 21:16:03 -0000	1.1
--- ui_core.hpp	19 Apr 2005 17:55:56 -0000	1.2
***************
*** 23,27 ****
  #include <adobe/value.hpp>
  #include <adobe/dictionary.hpp>
! #include <adobe/rectangle.hpp>
  
  /****************************************************************************************************/
--- 23,36 ----
  #include <adobe/value.hpp>
  #include <adobe/dictionary.hpp>
! #include <adobe/extents.hpp>
! 
! /****************************************************************************************************/
! 
! /*!
! 	\defgroup ui_core UI Core Widget API
! 	\ingroup widget_lib
! 
! 	This collection documentes the UI core widget element set.
! */
  
  /****************************************************************************************************/
***************
*** 64,86 ****
  #if defined(ADOBE_SERIALIZATION)
  
! 	#define	ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(type)	\
  	bool 			operator ==	(const type& x,		const type& y);			\
- 	bool			operator <	(const type& x,		const type& y);			\
  	std::ostream&	operator <<	(std::ostream& s,	const type& x)
  
! 	#define	ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(type)	\
  	friend bool				operator ==	(const type& x,		const type& y);			\
- 	friend bool				operator <	(const type& x,		const type& y);			\
  	friend std::ostream&	operator <<	(std::ostream& s,	const type& x)
  
  #else
  
! 	#define	ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(type)	\
! 	bool 			operator ==	(const type& x,		const type& y);			\
! 	bool			operator <	(const type& x,		const type& y)
  
! 	#define	ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(type)	\
! 	friend bool				operator ==	(const type& x,		const type& y);			\
! 	friend bool				operator <	(const type& x,		const type& y)
  
  #endif
--- 73,91 ----
  #if defined(ADOBE_SERIALIZATION)
  
! 	#define	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(type)	\
  	bool 			operator ==	(const type& x,		const type& y);			\
  	std::ostream&	operator <<	(std::ostream& s,	const type& x)
  
! 	#define	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(type)	\
  	friend bool				operator ==	(const type& x,		const type& y);			\
  	friend std::ostream&	operator <<	(std::ostream& s,	const type& x)
  
  #else
  
! 	#define	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(type)	\
! 	bool 			operator ==	(const type& x,		const type& y);
  
! 	#define	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(type)	\
! 	friend bool				operator ==	(const type& x,		const type& y);
  
  #endif
***************
*** 139,167 ****
  };
  
  enum theme_t
  {
  	theme_none_s				=	0,
  
! 	// Theme bases. Mutually exclusive.
! 	theme_large_s				=	1,	// for dialogs & windows (atypical)
! 	theme_normal_s				=	2,	// for dialogs & windows
! 	theme_small_s				=	3,	// for palettes
! 	theme_mini_s				=	4,	// for palettes (atypical)
  
! 	// Theme adornments. Can be set with any of the above.
! 	theme_adornment_label_s		=	1L << 29,	// displaying a label
! 	theme_adornment_number_s	=	1L << 30,	// displaying a number
! 	theme_adornment_mono_s		=	1L << 31,	// monospacing
  
! 	// Masks
  	theme_mask_s				=	theme_large_s	|
  									theme_normal_s	|
  									theme_small_s	|
  									theme_mini_s,
  	theme_adornment_mask_s		=	theme_adornment_mono_s		|
  									theme_adornment_number_s	|
  									theme_adornment_label_s,
  
! 	// Default theme
  	theme_default_s				=	theme_normal_s
  };
--- 144,191 ----
  };
  
+ /*!
+ \ingroup ui_core
+ 
+ \brief Semantic theme settings to apply to a widget
+ 
+ \note
+ 	The theme sizes (<code>theme_large_s</code> through <code>theme_mini_s</code>)\
+ 	are mutually exclusive. A theme's adornments can be manipulated via logical
+ 	operations.
+ */
+ 
  enum theme_t
  {
+ 	/// No theme
  	theme_none_s				=	0,
  
! 	/// For dialogs & windows (atypical)
! 	theme_large_s				=	1,
! 	/// For dialogs & windows
! 	theme_normal_s				=	2,
! 	/// For palettes
! 	theme_small_s				=	3,
! 	/// For palettes (atypical)
! 	theme_mini_s				=	4,
  
! 	/// Adornment for displaying a label
! 	theme_adornment_label_s		=	1L << 29,
! 	/// Adornment for displaying a number
! 	theme_adornment_number_s	=	1L << 30,
! 	/// Adornment for monospacing widget text
! 	theme_adornment_mono_s		=	1L << 31,
  
! 	/// Theme mask to obtain widget size
  	theme_mask_s				=	theme_large_s	|
  									theme_normal_s	|
  									theme_small_s	|
  									theme_mini_s,
+ 
+ 	/// Theme mask to obtain widget adornments
  	theme_adornment_mask_s		=	theme_adornment_mono_s		|
  									theme_adornment_number_s	|
  									theme_adornment_label_s,
  
! 	/// Default theme
  	theme_default_s				=	theme_normal_s
  };
***************
*** 211,215 ****
  typedef	boost::function<void (adobe::modifiers_t, std::size_t)>						radio_button_hit_proc_t;
  
! typedef	boost::function<void (adobe::modifiers_t, std::size_t)>						checkbox_hit_proc_t;
  
  typedef	control_hit_proc_t															link_hit_proc_t;
--- 235,239 ----
  typedef	boost::function<void (adobe::modifiers_t, std::size_t)>						radio_button_hit_proc_t;
  
! typedef	boost::function<void (adobe::value_t)>										checkbox_hit_proc_t;
  
  typedef	control_hit_proc_t															link_hit_proc_t;
***************
*** 295,299 ****
  /****************************************************************************************************/
  
! struct window_t : boost::totally_ordered<window_t>
  {
  	window_t();
--- 319,323 ----
  /****************************************************************************************************/
  
! struct window_t : boost::equality_comparable<window_t>
  {
  	window_t();
***************
*** 307,311 ****
  							window_modality_t	modality);
  
! 	void		set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void		reposition(window_reposition_t position);
--- 331,335 ----
  							window_modality_t	modality);
  
! 	void		set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void		reposition(window_reposition_t position);
***************
*** 318,322 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(window_t);
  
--- 342,346 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(window_t);
  
***************
*** 340,344 ****
  /****************************************************************************************************/
  
! struct group_t : boost::totally_ordered<group_t>
  {
  	struct implementation_t;
--- 364,368 ----
  /****************************************************************************************************/
  
! struct group_t : boost::equality_comparable<group_t>
  {
  	struct implementation_t;
***************
*** 351,356 ****
  	void			initialize(const std::string& name);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 375,380 ----
  	void			initialize(const std::string& name);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 364,368 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(group_t);
  
--- 388,392 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(group_t);
  
***************
*** 376,380 ****
  /****************************************************************************************************/
  
! struct tab_group_t : boost::totally_ordered<tab_group_t>
  {
  	struct implementation_t;
--- 400,404 ----
  /****************************************************************************************************/
  
! struct tab_group_t : boost::equality_comparable<tab_group_t>
  {
  	struct implementation_t;
***************
*** 393,398 ****
  	void			initialize(tab_t* first, tab_t* last);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_theme(theme_t theme);
--- 417,422 ----
  	void			initialize(tab_t* first, tab_t* last);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_theme(theme_t theme);
***************
*** 408,412 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(tab_group_t);
  
--- 432,436 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(tab_group_t);
  
***************
*** 420,424 ****
  /****************************************************************************************************/
  
! struct panel_t : boost::totally_ordered<panel_t>
  {
  	struct implementation_t;
--- 444,448 ----
  /****************************************************************************************************/
  
! struct panel_t : boost::equality_comparable<panel_t>
  {
  	struct implementation_t;
***************
*** 431,436 ****
  	void			initialize();
  
! 	rectangle_t		best_bounds() { return rectangle_t(); }
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_active(bool make_active);
--- 455,460 ----
  	void			initialize();
  
! 	extents_t		best_bounds() { return extents_t(); }
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_active(bool make_active);
***************
*** 438,442 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(panel_t);
  
--- 462,466 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(panel_t);
  
***************
*** 450,460 ****
  /****************************************************************************************************/
  
! /*
! 	REVISIT (sparent) : Comments on button_t
  
! 	nuke initialize - prefer construction. Use boost::optional to defer construction if needed.
  */
  
! struct button_t : boost::totally_ordered<button_t>
  {
  	struct implementation_t;
--- 474,484 ----
  /****************************************************************************************************/
  
! /*!
! 	\ingroup ui_core
  
! 	\todo (sparent) : nuke initialize - prefer construction. Use boost::optional to defer construction if needed.
  */
  
! struct button_t : boost::equality_comparable<button_t>
  {
  	struct implementation_t;
***************
*** 480,485 ****
  	void			initialize(state_descriptor_t* first, state_descriptor_t* last);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 504,509 ----
  	void			initialize(state_descriptor_t* first, state_descriptor_t* last);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 503,507 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(button_t);
  
--- 527,531 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(button_t);
  
***************
*** 515,519 ****
  /****************************************************************************************************/
  
! struct radio_button_t : boost::totally_ordered<radio_button_t>
  {
  	struct implementation_t;
--- 539,543 ----
  /****************************************************************************************************/
  
! struct radio_button_t : boost::equality_comparable<radio_button_t>
  {
  	struct implementation_t;
***************
*** 526,531 ****
  	void			initialize(const std::string& name);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 550,555 ----
  	void			initialize(const std::string& name);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 545,549 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(radio_button_t);
  
--- 569,573 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(radio_button_t);
  
***************
*** 557,591 ****
  /****************************************************************************************************/
  
! struct checkbox_t : boost::totally_ordered<checkbox_t>
  {
  	struct implementation_t;
  
! 	checkbox_t();
! 	checkbox_t(const checkbox_t& rhs);
  
! 	~checkbox_t();
  
! 	void			initialize(const std::string& name);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
! 	void			set_name(const std::string& name);
  
! 	void			set_theme(theme_t theme);
! 	void			adorn_theme(theme_t theme);
! 	void			unadorn_theme(theme_t theme);
  
  	void			set_active(bool make_active);
- 	void			set_visible(bool make_visible);
  
! 	void			set_focused(bool make_focused);
! 	void			set_value(bool value);
  
- 	void			signal_focus(implementation::control_focus_proc_t proc);
  	void			signal_hit(adobe::implementation::checkbox_hit_proc_t proc);
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(checkbox_t);
  
--- 581,625 ----
  /****************************************************************************************************/
  
! /*!
! 	\ingroup ui_core
! 
! 	\brief UI core checkbox widget
! */
! 
! struct checkbox_t : boost::equality_comparable<checkbox_t>
  {
  	struct implementation_t;
  
! 	/*!
! 		\param name			Name of the widget
! 		\param true_value	Value to which the checkbox is set when it is checked
! 		\param false_value	Value to which the checkbox is set when it is unchecked
! 		\param theme		Theme for the widget
  
! 		\note
! 			If the checkbox is set to a value other than <code>true_value</code> or
! 			<code>false_value</code>, the checkbox gets a 'dash' (undefined) state.
! 	*/
! 	checkbox_t(	const std::string&	name,
! 				adobe::value_t		true_value,
! 				adobe::value_t		false_value,
! 				theme_t				theme);
  
! 	checkbox_t(const checkbox_t& rhs);
  
! 	~checkbox_t();
  
! 	extents_t		measure();
  
! 	void			set_bounds(const point_2d_t& position, const extents_t& extents);
  
  	void			set_active(bool make_active);
  
! 	void			set_value(adobe::value_t value);
  
  	void			signal_hit(adobe::implementation::checkbox_hit_proc_t proc);
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(checkbox_t);
  
***************
*** 599,603 ****
  /****************************************************************************************************/
  
! struct link_t : boost::totally_ordered<link_t>
  {
  	struct implementation_t;
--- 633,637 ----
  /****************************************************************************************************/
  
! struct link_t : boost::equality_comparable<link_t>
  {
  	struct implementation_t;
***************
*** 610,615 ****
  	void			initialize();
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_theme(theme_t theme);
--- 644,649 ----
  	void			initialize();
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_theme(theme_t theme);
***************
*** 624,628 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(link_t);
  
--- 658,662 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(link_t);
  
***************
*** 636,640 ****
  /****************************************************************************************************/
  
! struct progress_bar_t : boost::totally_ordered<progress_bar_t>
  {
  	struct implementation_t;
--- 670,674 ----
  /****************************************************************************************************/
  
! struct progress_bar_t : boost::equality_comparable<progress_bar_t>
  {
  	struct implementation_t;
***************
*** 647,652 ****
  	void			initialize(pb_style_t bar_style, bool is_vertical);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_theme(theme_t theme);
--- 681,686 ----
  	void			initialize(pb_style_t bar_style, bool is_vertical);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_theme(theme_t theme);
***************
*** 664,668 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(progress_bar_t);
  
--- 698,702 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(progress_bar_t);
  
***************
*** 676,680 ****
  /****************************************************************************************************/
  
! struct separator_t : boost::totally_ordered<separator_t>
  {
  	struct implementation_t;
--- 710,714 ----
  /****************************************************************************************************/
  
! struct separator_t : boost::equality_comparable<separator_t>
  {
  	struct implementation_t;
***************
*** 687,697 ****
  	void			initialize();
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_visible(bool make_visible);
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(separator_t);
  
--- 721,731 ----
  	void			initialize();
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_visible(bool make_visible);
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(separator_t);
  
***************
*** 705,709 ****
  /****************************************************************************************************/
  
! struct static_text_t : boost::totally_ordered<static_text_t>
  {
  	struct implementation_t;
--- 739,743 ----
  /****************************************************************************************************/
  
! struct static_text_t : boost::equality_comparable<static_text_t>
  {
  	struct implementation_t;
***************
*** 716,721 ****
  	void			initialize(const std::string& name);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 750,755 ----
  	void			initialize(const std::string& name);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 735,739 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(static_text_t);
  
--- 769,773 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(static_text_t);
  
***************
*** 747,751 ****
  /****************************************************************************************************/
  
! struct edit_text_t : boost::totally_ordered<edit_text_t>
  {
  	struct implementation_t;
--- 781,785 ----
  /****************************************************************************************************/
  
! struct edit_text_t : boost::equality_comparable<edit_text_t>
  {
  	struct implementation_t;
***************
*** 761,766 ****
  						long rows);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 795,800 ----
  						long rows);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 786,790 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(edit_text_t);
  
--- 820,824 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(edit_text_t);
  
***************
*** 798,802 ****
  /****************************************************************************************************/
  
! struct popup_t : boost::totally_ordered<popup_t>
  {
  	struct implementation_t;
--- 832,836 ----
  /****************************************************************************************************/
  
! struct popup_t : boost::equality_comparable<popup_t>
  {
  	struct implementation_t;
***************
*** 809,814 ****
  	void			initialize(const std::string& name);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 843,848 ----
  	void			initialize(const std::string& name);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 836,840 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(popup_t);
  
--- 870,874 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(popup_t);
  
***************
*** 848,852 ****
  /****************************************************************************************************/
  
! struct unit_edit_text_t : boost::totally_ordered<unit_edit_text_t>
  {
  	struct implementation_t;
--- 882,886 ----
  /****************************************************************************************************/
  
! struct unit_edit_text_t : boost::equality_comparable<unit_edit_text_t>
  {
  	struct implementation_t;
***************
*** 862,867 ****
  						bool			using_popup = true);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 896,901 ----
  						bool			using_popup = true);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 891,895 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(unit_edit_text_t);
  
--- 925,929 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(unit_edit_text_t);
  
***************
*** 903,907 ****
  /****************************************************************************************************/
  
! struct slider_t : boost::totally_ordered<slider_t>
  {
  	struct implementation_t;
--- 937,941 ----
  /****************************************************************************************************/
  
! struct slider_t : boost::equality_comparable<slider_t>
  {
  	struct implementation_t;
***************
*** 916,921 ****
  								long			num_tick_marks = 0);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_theme(theme_t theme);
--- 950,955 ----
  								long			num_tick_marks = 0);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_theme(theme_t theme);
***************
*** 936,940 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(slider_t);
  
--- 970,974 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(slider_t);
  
***************
*** 948,952 ****
  /****************************************************************************************************/
  
! struct bevel_button_t : boost::totally_ordered<bevel_button_t>
  {
  	struct implementation_t;
--- 982,986 ----
  /****************************************************************************************************/
  
! struct bevel_button_t : boost::equality_comparable<bevel_button_t>
  {
  	struct implementation_t;
***************
*** 961,966 ****
  								bool				menu_points_right);
  
! 	rectangle_t		best_bounds();
! 	void			set_bounds(const point_t& position, const rectangle_t& geometry);
  
  	void			set_name(const std::string& name);
--- 995,1000 ----
  								bool				menu_points_right);
  
! 	extents_t		best_bounds();
! 	void			set_bounds(const point_2d_t& position, const extents_t& geometry);
  
  	void			set_name(const std::string& name);
***************
*** 988,992 ****
  
  private:
! 	 ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(bevel_button_t);
  
--- 1022,1026 ----
  
  private:
! 	 ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t);
  	 ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(bevel_button_t);
  
***************
*** 1001,1026 ****
  #ifndef NDEBUG
  
! void frame_geometry(window_t& window, const point_t& position, const rectangle_t& geometry);
! bool clear_geometry_frames(window_t& window);
  
  #endif // NDEBUG
  /****************************************************************************************************/
  
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::window_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::group_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::tab_group_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::button_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::panel_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::radio_button_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::checkbox_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::link_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::progress_bar_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::separator_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::static_text_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::edit_text_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::popup_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::slider_t);
! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::bevel_button_t);
  
  /****************************************************************************************************/
--- 1035,1060 ----
  #ifndef NDEBUG
  
! void frame_extents(window_t& window, const point_2d_t& position, const extents_t& geometry);
! bool clear_extents_frames(window_t& window);
  
  #endif // NDEBUG
  /****************************************************************************************************/
  
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::window_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::group_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::tab_group_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::button_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::panel_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::radio_button_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::checkbox_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::link_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::progress_bar_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::separator_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::static_text_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::edit_text_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::popup_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::slider_t);
! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::bevel_button_t);
  
  /****************************************************************************************************/