[adobe-source-commits] sandbox/adobe-source/adobe/future/widgets/headers/fltk ui_core_implementation.hpp,1.6,1.7

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

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers/fltk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6755/adobe/future/widgets/headers/fltk

Modified Files:
	ui_core_implementation.hpp 
Log Message:
asl 1.0.13

Index: ui_core_implementation.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers/fltk/ui_core_implementation.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ui_core_implementation.hpp	24 Jan 2006 08:42:18 -0000	1.6
--- ui_core_implementation.hpp	3 Feb 2006 18:33:36 -0000	1.7
***************
*** 1,6 ****
  /*
! 	Copyright 2005 Ralph Thomas
! 	Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
! 	or a copy at http://opensource.adobe.com/licenses.html)
  */
  
--- 1,6 ----
  /*
!     Copyright 2005 Ralph Thomas
!     Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
!     or a copy at http://opensource.adobe.com/licenses.html)
  */
  
***************
*** 33,46 ****
  struct number_formatter_t::implementation_t
  {
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void		initialize();
! 	void		set_format(const std::string& format);
! 	std::string	get_format() const;
! 	std::string	format(const value_t& x);
! 	value_t		parse(const std::string& str, value_t the_type);
  
! 	std::string format_m;
  };
  
--- 33,46 ----
  struct number_formatter_t::implementation_t
  {
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void        initialize();
!     void        set_format(const std::string& format);
!     std::string get_format() const;
!     std::string format(const value_t& x);
!     value_t     parse(const std::string& str, value_t the_type);
  
!     std::string format_m;
  };
  
***************
*** 48,85 ****
  struct control_t : boost::equality_comparable<control_t>
  {
! 	control_t();
! 	control_t(theme_t theme);
! 	control_t(const control_t& rhs);
  
! 	virtual			~control_t();
! 	virtual extents_t	best_bounds();
! 	void			set_bounds(
! 					const point_2d_t& position,
! 					const extents_t& geometry);
! 	void			place(	const point_2d_t& position,
! 					const extents_t& geometry);
! 	void			set_name(const std::string& name);
! 	virtual 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			enable(bool make_enabled);
! 	void			set_visible(bool make_visible);
! 	void			set_focused(bool make_focused);
! 	bool			is_focused();
! 	void			signal_focus(const implementation::control_focus_proc_t& proc);
! 	virtual dictionary_t	essentials() const;
! 	virtual void		callback();
! 	static void		callback_s(fltk::Widget* w, void* v);
! 	//
! 	// These member variables should only be accessed from
! 	// inside the ui_core_implementation.
! 	//
! 	fltk::Widget*				control_m;
! 	theme_t					theme_m;
! 	implementation::control_focus_proc_t	focus_proc_m;
! 	extents_t				geometry_m;
! 	point_2d_t				position_m;
! 	std::string				widget_type_m;
  };
  
--- 48,85 ----
  struct control_t : boost::equality_comparable<control_t>
  {
!     control_t();
!     control_t(theme_t theme);
!     control_t(const control_t& rhs);
  
!     virtual         ~control_t();
!     virtual extents_t   best_bounds();
!     void            set_bounds(
!                     const point_2d_t& position,
!                     const extents_t& geometry);
!     void            place(  const point_2d_t& position,
!                     const extents_t& geometry);
!     void            set_name(const std::string& name);
!     virtual 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            enable(bool make_enabled);
!     void            set_visible(bool make_visible);
!     void            set_focused(bool make_focused);
!     bool            is_focused();
!     void            signal_focus(const implementation::control_focus_proc_t& proc);
!     virtual dictionary_t    essentials() const;
!     virtual void        callback();
!     static void     callback_s(fltk::Widget* w, void* v);
!     //
!     // These member variables should only be accessed from
!     // inside the ui_core_implementation.
!     //
!     fltk::Widget*               control_m;
!     theme_t                 theme_m;
!     implementation::control_focus_proc_t    focus_proc_m;
!     extents_t               geometry_m;
!     point_2d_t              position_m;
!     std::string             widget_type_m;
  };
  
***************
*** 88,115 ****
  struct window_t::implementation_t : boost::equality_comparable<window_t::implementation_t>
  {
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
! 	virtual ~implementation_t();
  
! 	void initialize(const std::string& name,
! 			const fltk::Rectangle& bounds,
! 			window_style_t style,
! 			window_attributes_t attributes,
! 			window_modality_t modality);
! 	void set_bounds(const point_2d_t& position,
! 			const extents_t& geometry);
! 	void set_size(const point_2d_t& size);
! 	void reposition(window_reposition_t position);
! 	void set_visible(bool make_visible);
! 	void draw_controls();
! 	void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc);
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t);
  
! 	dictionary_t essentials() const;
! 	class notify_window*	window_m;
! 	extents_t	geometry_m;
! 	point_2d_t	position_m;
! 	implementation::window_resize_complete_proc_t resize_complete_proc_m;
  };
  
--- 88,116 ----
  struct window_t::implementation_t : boost::equality_comparable<window_t::implementation_t>
  {
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
!     virtual ~implementation_t();
  
!     void initialize(const std::string& name,
!             const fltk::Rectangle& bounds,
!             window_style_t style,
!             window_attributes_t attributes,
!             window_modality_t modality);
!     extents_t measure() { return extents_t(); }
!     void set_bounds(const point_2d_t& position,
!             const extents_t& geometry);
!     void set_size(const point_2d_t& size);
!     void reposition(window_reposition_t position);
!     void set_visible(bool make_visible);
!     void draw_controls();
!     void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc);
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t);
  
!     dictionary_t essentials() const;
!     class notify_window*    window_m;
!     extents_t   geometry_m;
!     point_2d_t  position_m;
!     implementation::window_resize_complete_proc_t resize_complete_proc_m;
  };
  
***************
*** 118,130 ****
  struct group_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const std::string& name);
! 	virtual extents_t best_bounds();
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t);
  };
  
--- 119,131 ----
  struct group_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             const std::string& name);
!     virtual extents_t best_bounds();
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t);
  };
  
***************
*** 133,157 ****
  struct tab_group_t::implementation_t : control_t
  {
! 	typedef control_t			_super;
! 	typedef std::vector<tab_group_t::tab_t>	tab_set_t;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const tab_group_t::tab_t* first,
! 			const tab_group_t::tab_t* last);
! 	virtual extents_t best_bounds();
! 	void set_value(const value_t& new_value);
! 	void signal_value_change(const implementation::tab_group_value_proc_t& proc);
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t);
  
! 	virtual dictionary_t essentials() const;
! 	virtual void callback();
  
! 	int debounce_m;
! 	implementation::tab_group_value_proc_t value_proc_m;
! 	tab_set_t items_m;
  };
  
--- 134,158 ----
  struct tab_group_t::implementation_t : control_t
  {
!     typedef control_t           _super;
!     typedef std::vector<tab_group_t::tab_t> tab_set_t;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             const tab_group_t::tab_t* first,
!             const tab_group_t::tab_t* last);
!     virtual extents_t best_bounds();
!     void set_value(const value_t& new_value);
!     void signal_value_change(const implementation::tab_group_value_proc_t& proc);
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t);
  
!     virtual dictionary_t essentials() const;
!     virtual void callback();
  
!     int debounce_m;
!     implementation::tab_group_value_proc_t value_proc_m;
!     tab_set_t items_m;
  };
  
***************
*** 160,171 ****
  struct panel_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds);
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t);
  };
  
--- 161,172 ----
  struct panel_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds);
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t);
  };
  
***************
*** 174,198 ****
  struct button_t::implementation_t : control_t
  {
! 	typedef control_t _super;
! 	typedef std::vector<state_descriptor_t> state_set_t;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 		const button_t::state_descriptor_t* first,
! 		const button_t::state_descriptor_t* last);
! 	void set_default(bool is_default);
! 	void set_cancel(bool is_cancel);
! 	void set_value(modifiers_t modifiers, const value_t& value);
! 	void set_contributing(modifiers_t modifiers,
! 		const std::pair<dictionary_t, array_t>& value);
! 	virtual void callback();
! 	
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t);
  
! 	virtual dictionary_t essentials() const;
  
! 	state_set_t state_set_m;
  };
  
--- 175,199 ----
  struct button_t::implementation_t : control_t
  {
!     typedef control_t _super;
!     typedef std::vector<state_descriptor_t> state_set_t;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!         const button_t::state_descriptor_t* first,
!         const button_t::state_descriptor_t* last);
!     void set_default(bool is_default);
!     void set_cancel(bool is_cancel);
!     void set_value(modifiers_t modifiers, const value_t& value);
!     void set_contributing(modifiers_t modifiers,
!         const std::pair<dictionary_t, array_t>& value);
!     virtual void callback();
!     
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t);
  
!     virtual dictionary_t essentials() const;
  
!     state_set_t state_set_m;
  };
  
***************
*** 201,227 ****
  struct radio_button_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t(const std::string& name, const adobe::value_t& value,
! 			 adobe::theme_t theme);
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 		const std::string& name);
  
! 	extents_t	measure();
! 	void		enable(bool make_enabled);
! 	void		set(const adobe::value_t& value);
! 	void		monitor(const
! 				implementation::radio_button_hit_proc_t& proc);
! 	virtual void callback();
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t);
  
! 	virtual dictionary_t essentials() const;
  
! 	implementation::radio_button_hit_proc_t hit_proc_m;
! 	adobe::value_t				set_value_m;
! 	adobe::value_t				last_m;
  };
  
--- 202,228 ----
  struct radio_button_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t(const std::string& name, const adobe::value_t& value,
!              adobe::theme_t theme);
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!         const std::string& name);
  
!     extents_t   measure();
!     void        enable(bool make_enabled);
!     void        set(const adobe::value_t& value);
!     void        monitor(const
!                 implementation::radio_button_hit_proc_t& proc);
!     virtual void callback();
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t);
  
!     virtual dictionary_t essentials() const;
  
!     implementation::radio_button_hit_proc_t hit_proc_m;
!     adobe::value_t              set_value_m;
!     adobe::value_t              last_m;
  };
  
***************
*** 231,257 ****
  struct checkbox_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t(const std::string& name,
! 			const adobe::value_t& true_value,
! 			const adobe::value_t& false_value,
! 			theme_t theme);
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const std::string& name);
! 	virtual extents_t measure();
! 	virtual void set(adobe::value_t new_value);
! 	void monitor(const implementation::checkbox_hit_proc_t&
! 			proc);
! 	virtual void callback();
! 	virtual dictionary_t essentials() const;
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t);
  
! 	implementation::checkbox_hit_proc_t hit_proc_m;
! 	adobe::value_t true_value_m;
! 	adobe::value_t false_value_m;
! 	adobe::value_t current_value_m;
  };
  
--- 232,258 ----
  struct checkbox_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t(const std::string& name,
!             const adobe::value_t& true_value,
!             const adobe::value_t& false_value,
!             theme_t theme);
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             const std::string& name);
!     virtual extents_t measure();
!     virtual void set(adobe::value_t new_value);
!     void monitor(const implementation::checkbox_hit_proc_t&
!             proc);
!     virtual void callback();
!     virtual dictionary_t essentials() const;
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t);
  
!     implementation::checkbox_hit_proc_t hit_proc_m;
!     adobe::value_t true_value_m;
!     adobe::value_t false_value_m;
!     adobe::value_t current_value_m;
  };
  
***************
*** 260,278 ****
  struct link_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds);
! 	void set_value(bool value);
! 	void signal_hit(const implementation::link_hit_proc_t& proc);
! 	virtual void callback();
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t);
  
! 	implementation::link_hit_proc_t hit_proc_m;
! 	guide_set_t prongs_m;
! 	bool value_m;
  };
  
--- 261,279 ----
  struct link_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds);
!     void set_value(bool value);
!     void signal_hit(const implementation::link_hit_proc_t& proc);
!     virtual void callback();
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t);
  
!     implementation::link_hit_proc_t hit_proc_m;
!     guide_set_t prongs_m;
!     bool value_m;
  };
  
***************
*** 281,301 ****
  struct progress_bar_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			pb_style_t bar_style,
! 			bool is_vertical);
! 	virtual extents_t best_bounds();
! 	void set_min_value(long min_value);
! 	void set_max_value(long max_value);
! 	void set_value(long value);
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t);
  
! 	bool is_vertical_m;
! 	pb_style_t bar_style_m;
  };
  
--- 282,302 ----
  struct progress_bar_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             pb_style_t bar_style,
!             bool is_vertical);
!     virtual extents_t best_bounds();
!     void set_min_value(long min_value);
!     void set_max_value(long max_value);
!     void set_value(long value);
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t);
  
!     bool is_vertical_m;
!     pb_style_t bar_style_m;
  };
  
***************
*** 304,315 ****
  struct separator_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds);
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t);
  };
  
--- 305,316 ----
  struct separator_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds);
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t);
  };
  
***************
*** 318,338 ****
  struct static_text_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const std::string& name);
! 	long best_height_given_width(long width);
! 	void set_name(const std::string& name);
! 	void signal_hit(
! 		const implementation::static_text_hit_proc_t& proc);
! 	virtual dictionary_t essentials() const;
! 	virtual void callback();
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t);
  
! 	implementation::static_text_hit_proc_t hit_proc_m;
  };
  
--- 319,339 ----
  struct static_text_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             const std::string& name);
!     long best_height_given_width(long width);
!     void set_name(const std::string& name);
!     void signal_hit(
!         const implementation::static_text_hit_proc_t& proc);
!     virtual dictionary_t essentials() const;
!     virtual void callback();
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t);
  
!     implementation::static_text_hit_proc_t hit_proc_m;
  };
  
***************
*** 341,383 ****
  struct edit_text_t::implementation_t : control_t
  {
! 	typedef control_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const std::string& name,
! 			bool scrollable,
! 			bool password,
! 			long rows,
! 			long cols);
! 	virtual extents_t best_bounds();
! 	virtual void set_bounds(const point_2d_t& position,
! 			const extents_t& geometry);
! 	void set_field_text(const std::string& text);
! 	void set_static_disabled(bool is_static_disabled);
! 	void set_selection(long start_char, long end_char);
! 	void signal_pre_edit(
! 		const implementation::edit_text_pre_edit_proc_t& p);
! 	void signal_post_edit(
! 		const implementation::edit_text_post_edit_proc_t& p);
! 	void signal_label_hit(
! 		const implementation::edit_text_label_hit_proc_t& p);
! 	virtual dictionary_t essentials() const;
! 	virtual void callback();
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t);
  
! 	std::string field_text_m;
! 	std::string name_m;
! 	std::string static_disabled_text_m;
! 	bool static_disabled_m;
! 	bool using_label_m;
! 	long rows_m;
! 	long cols_m;
! 	bool scrollable_m;
! 	bool password_m;
! 	implementation::edit_text_post_edit_proc_t post_edit_proc_m;
! 	implementation::edit_text_label_hit_proc_t label_hit_proc_m;
  };
  
--- 342,384 ----
  struct edit_text_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             const std::string& name,
!             bool scrollable,
!             bool password,
!             long rows,
!             long cols);
!     virtual extents_t best_bounds();
!     virtual void set_bounds(const point_2d_t& position,
!             const extents_t& geometry);
!     void set_field_text(const std::string& text);
!     void set_static_disabled(bool is_static_disabled);
!     void set_selection(long start_char, long end_char);
!     void signal_pre_edit(
!         const implementation::edit_text_pre_edit_proc_t& p);
!     void signal_post_edit(
!         const implementation::edit_text_post_edit_proc_t& p);
!     void signal_label_hit(
!         const implementation::edit_text_label_hit_proc_t& p);
!     virtual dictionary_t essentials() const;
!     virtual void callback();
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t);
  
!     std::string field_text_m;
!     std::string name_m;
!     std::string static_disabled_text_m;
!     bool static_disabled_m;
!     bool using_label_m;
!     long rows_m;
!     long cols_m;
!     bool scrollable_m;
!     bool password_m;
!     implementation::edit_text_post_edit_proc_t post_edit_proc_m;
!     implementation::edit_text_label_hit_proc_t label_hit_proc_m;
  };
  
***************
*** 386,420 ****
  struct popup_t::implementation_t : control_t
  {
! 	typedef control_t _super;
! 	typedef std::pair<std::string, value_t> menu_item_t;
! 	typedef std::vector<menu_item_t> menu_items_t;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const std::string& name);
! 	virtual extents_t best_bounds();
! 	void set_bounds(const point_2d_t& position,
! 			const extents_t& geometry);
! 	void set_static_disabled(bool is_static_disabled);
! 	void add_menu_item(const std::string& name,
! 		const value_t& value);
! 	void clear_menu_items();
! 	void set_current_menu_item(const value_t& item);
! 	void select_with_text(const std::string& text);
! 	void signal_value_change(
! 		const implementation::popup_value_proc_t& proc);
! 	virtual dictionary_t essentials() const;
! 	virtual void callback();
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t);
  
! 	std::string name_m;
! 	std::string static_disabled_text_m;
! 	bool static_disabled_m;
! 	bool using_label_m;
! 	implementation::popup_value_proc_t value_proc_m;
! 	menu_items_t menu_items_m;
  };
  
--- 387,421 ----
  struct popup_t::implementation_t : control_t
  {
!     typedef control_t _super;
!     typedef std::pair<std::string, value_t> menu_item_t;
!     typedef std::vector<menu_item_t> menu_items_t;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             const std::string& name);
!     virtual extents_t best_bounds();
!     void set_bounds(const point_2d_t& position,
!             const extents_t& geometry);
!     void set_static_disabled(bool is_static_disabled);
!     void add_menu_item(const std::string& name,
!         const value_t& value);
!     void clear_menu_items();
!     void set_current_menu_item(const value_t& item);
!     void select_with_text(const std::string& text);
!     void signal_value_change(
!         const implementation::popup_value_proc_t& proc);
!     virtual dictionary_t essentials() const;
!     virtual void callback();
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t);
  
!     std::string name_m;
!     std::string static_disabled_text_m;
!     bool static_disabled_m;
!     bool using_label_m;
!     implementation::popup_value_proc_t value_proc_m;
!     menu_items_t menu_items_m;
  };
  
***************
*** 423,461 ****
  struct unit_edit_text_t::implementation_t : edit_text_t::implementation_t
  {
! 	typedef edit_text_t::implementation_t _super;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const std::string& name,
! 			bool using_popup,
! 			long cols,
! 			long rows);
! 	popup_t& get_popup();
! 	virtual extents_t best_bounds();
! 	void set_bounds(const point_2d_t& position,
! 			const extents_t& geometry);
! 	void set_active(bool is_active);
! 	virtual void set_theme(theme_t theme);
! 	void add_popup_menu_item(const std::string& name,
! 		const value_t& value);
! 	void select_popup_with_text(const std::string& text);
! 	void signal_popup_value_change(
! 		const implementation::popup_value_proc_t& proc);
! 	virtual dictionary_t essentials() const;
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t);
  
! 	popup_t popup_m;
! 	bool using_popup_m;
! 	//
! 	// REVISIT (ralpht): Currently we just make the popup and
! 	//	edit widgets the same height and hope that we end
! 	//	up with baseline alignment. We clearly won't, so
! 	//	at some point it will become important to store the
! 	//	heights and baselines of the edit and popup widgets
! 	//	so that we can get baseline alignment.
! 	//
  };
  
--- 424,462 ----
  struct unit_edit_text_t::implementation_t : edit_text_t::implementation_t
  {
!     typedef edit_text_t::implementation_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(const fltk::Rectangle& bounds,
!             const std::string& name,
!             bool using_popup,
!             long cols,
!             long rows);
!     popup_t& get_popup();
!     virtual extents_t best_bounds();
!     void set_bounds(const point_2d_t& position,
!             const extents_t& geometry);
!     void set_active(bool is_active);
!     virtual void set_theme(theme_t theme);
!     void add_popup_menu_item(const std::string& name,
!         const value_t& value);
!     void select_popup_with_text(const std::string& text);
!     void signal_popup_value_change(
!         const implementation::popup_value_proc_t& proc);
!     virtual dictionary_t essentials() const;
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t);
  
!     popup_t popup_m;
!     bool using_popup_m;
!     //
!     // REVISIT (ralpht): Currently we just make the popup and
!     //  edit widgets the same height and hope that we end
!     //  up with baseline alignment. We clearly won't, so
!     //  at some point it will become important to store the
!     //  heights and baselines of the edit and popup widgets
!     //  so that we can get baseline alignment.
!     //
  };
  
***************
*** 464,527 ****
  struct slider_t::implementation_t : control_t
  {
! 	typedef control_t _super;
! 
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
! 
! 	void initialize(/*const fltk::Rectangle& bounds,*/
! 			int zero,
! 			bool is_vertical,
! 			slider_style_t style,
! 			long num_tick_marks);
! 	virtual extents_t best_bounds();
! 	void set_min_value(long min_value);
! 	void set_max_value(long max_value);
! 	void set_value(long value);
! 	void signal_value_change(
! 		const implementation::slider_value_proc_t& proc);
! 	virtual void callback();
! 
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t);
! 
! 	implementation::slider_value_proc_t value_proc_m;
! 	bool is_vertical_m;
! 	slider_style_t style_m;
! 	long num_tick_marks_m;
! };
! 
! /****************************************************************************************************/
! 
! struct bevel_button_t::implementation_t : control_t
! {
! 	typedef control_t _super;
! 	typedef std::pair<std::string, value_t> menu_item_t;
! 	typedef std::vector<menu_item_t> menu_items_t;
  
! 	implementation_t();
! 	implementation_t(const implementation_t& rhs);
  
! 	void initialize(const fltk::Rectangle& bounds,
! 			const std::string& name,
! 			bool offset_contents,
! 			bool menu_points_right);
! 	void add_menu_item(const std::string& name,
! 		const value_t& value);
! 	void clear_menu_items();
! 	void set_bevel_amount(bevel_button_bevel_amount_t amount);
! 	void set_current_menu_item(const value_t& item);
! 	void set_value(bool value);
! 	void signal_hit(
! 		const implementation::bevel_button_hit_proc_t& proc);
! 	void signal_value_change(
! 		const implementation::bevel_button_popup_value_proc_t& proc);
! 	virtual dictionary_t essentials() const;
  
! 	ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t::implementation_t);
  
! 	implementation::bevel_button_hit_proc_t hit_proc_m;
! 	implementation::bevel_button_popup_value_proc_t value_proc_m;
! 	menu_items_t menu_items_m;
! 	bool offset_contents_m;
! 	bool menu_points_right_m;
  };
  
--- 465,492 ----
  struct slider_t::implementation_t : control_t
  {
!     typedef control_t _super;
  
!     implementation_t();
!     implementation_t(const implementation_t& rhs);
  
!     void initialize(/*const fltk::Rectangle& bounds,*/
!             int zero,
!             bool is_vertical,
!             slider_style_t style,
!             long num_tick_marks);
!     virtual extents_t best_bounds();
!     void set_min_value(long min_value);
!     void set_max_value(long max_value);
!     void set_value(long value);
!     void signal_value_change(
!         const implementation::slider_value_proc_t& proc);
!     virtual void callback();
  
!     ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t);
  
!     implementation::slider_value_proc_t value_proc_m;
!     bool is_vertical_m;
!     slider_style_t style_m;
!     long num_tick_marks_m;
  };
  
***************
*** 544,548 ****
  ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t::implementation_t);
  ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::slider_t::implementation_t);
- ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::bevel_button_t::implementation_t);
  
  /****************************************************************************************************/
--- 509,512 ----