[adobe-source-commits] sandbox/visual_refactor/adobe/test/visual/sources/win ui_core_implementation.cpp,1.1,1.2

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

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

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

Index: ui_core_implementation.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/win/ui_core_implementation.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ui_core_implementation.cpp	18 Apr 2005 21:16:06 -0000	1.1
--- ui_core_implementation.cpp	19 Apr 2005 17:56:00 -0000	1.2
***************
*** 139,143 ****
  /****************************************************************************************************/
  
! adobe::dictionary_t rectangle_slice_to_dictionary(const adobe::rectangle_t::slice_t& s)
  {
  	adobe::dictionary_t							result;
--- 139,143 ----
  /****************************************************************************************************/
  
! adobe::dictionary_t extents_slice_to_dictionary(const adobe::extents_t::slice_t& s)
  {
  	adobe::dictionary_t							result;
***************
*** 184,193 ****
  /****************************************************************************************************/
  
! adobe::dictionary_t rectangle_to_dictionary(const adobe::rectangle_t& r)
  {
  	adobe::dictionary_t result;
  
! 	result.set(adobe::static_name_t("vertical"), rectangle_slice_to_dictionary(r.slice_m[adobe::rectangle_slices_t::vertical]));
! 	result.set(adobe::static_name_t("horizontal"), rectangle_slice_to_dictionary(r.slice_m[adobe::rectangle_slices_t::horizontal]));
  
  	return result;
--- 184,193 ----
  /****************************************************************************************************/
  
! adobe::dictionary_t extents_to_dictionary(const adobe::extents_t& r)
  {
  	adobe::dictionary_t result;
  
! 	result.set(adobe::static_name_t("vertical"), extents_slice_to_dictionary(r.slice_m[adobe::extents_slices_t::vertical]));
! 	result.set(adobe::static_name_t("horizontal"), extents_slice_to_dictionary(r.slice_m[adobe::extents_slices_t::horizontal]));
  
  	return result;
***************
*** 640,645 ****
  
  	{
! 	adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m.begin());
! 	adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m.end());
  	for (; iter != last; ++iter)
  	{
--- 640,645 ----
  
  	{
! 	adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.begin());
! 	adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.end());
  	for (; iter != last; ++iter)
  	{
***************
*** 655,660 ****
  
  	{
! 	adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::rectangle_slices_t::vertical].poi_m.begin());
! 	adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::rectangle_slices_t::vertical].poi_m.end());
  	for (; iter != last; ++iter)
  	{
--- 655,660 ----
  
  	{
! 	adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.begin());
! 	adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.end());
  	for (; iter != last; ++iter)
  	{
***************
*** 776,782 ****
  /// \return	the best bounds for the edit control, including baseline.
  //
! ::adobe::rectangle_t calculate_edit_bounds(HWND control, int cols, int rows)
  {
! 	::adobe::rectangle_t result;
  	//
  	// First make sure that we have a valid control.
--- 776,782 ----
  /// \return	the best bounds for the edit control, including baseline.
  //
! ::adobe::extents_t calculate_edit_bounds(HWND control, int cols, int rows)
  {
! 	::adobe::extents_t result;
  	//
  	// First make sure that we have a valid control.
***************
*** 817,821 ****
  	result.height() = (wi.rcClient.top - wi.rcWindow.top) + (wi.rcWindow.bottom - wi.rcClient.bottom) + (rows * font_metrics.tmHeight) + em_rect.top + border;
  	result.width() = (extents.right - extents.left) + (wi.rcClient.left - wi.rcWindow.left) + (wi.rcWindow.right - wi.rcClient.right);
! 	result.slice_m[::adobe::rectangle_slices_t::vertical].poi_m.push_back((wi.rcClient.top - wi.rcWindow.top) + font_metrics.tmAscent + border);
  	return result;
  }
--- 817,821 ----
  	result.height() = (wi.rcClient.top - wi.rcWindow.top) + (wi.rcWindow.bottom - wi.rcClient.bottom) + (rows * font_metrics.tmHeight) + em_rect.top + border;
  	result.width() = (extents.right - extents.left) + (wi.rcClient.left - wi.rcWindow.left) + (wi.rcWindow.right - wi.rcClient.right);
! 	result.slice_m[::adobe::extents_slices_t::vertical].poi_m.push_back((wi.rcClient.top - wi.rcWindow.top) + font_metrics.tmAscent + border);
  	return result;
  }
***************
*** 840,846 ****
  /// \return	the best bounds for this widget, based on the given information.
  //
! ::adobe::rectangle_t calculate_best_bounds(const SIZE* widget_size, const MARGINS* widget_margins, const TEXTMETRIC* font_metrics, const RECT* text_extents, const int* border )
  {
! 	::adobe::rectangle_t result;
  	//
  	// First we need to try and calculate the baseline of the text in the widget.
--- 840,846 ----
  /// \return	the best bounds for this widget, based on the given information.
  //
! ::adobe::extents_t calculate_best_bounds(const SIZE* widget_size, const MARGINS* widget_margins, const TEXTMETRIC* font_metrics, const RECT* text_extents, const int* border )
  {
! 	::adobe::extents_t result;
  	//
  	// First we need to try and calculate the baseline of the text in the widget.
***************
*** 880,884 ****
  		// Store the baseline away in our result.
  		//
! 		result.slice_m[::adobe::rectangle_slices_t::vertical].poi_m.push_back(baseline);
  	}
  	//
--- 880,884 ----
  		// Store the baseline away in our result.
  		//
! 		result.slice_m[::adobe::extents_slices_t::vertical].poi_m.push_back(baseline);
  	}
  	//
***************
*** 1366,1370 ****
  /****************************************************************************************************/
  
! void window_t::implementation_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  {
  	assert(window_m);
--- 1366,1370 ----
  /****************************************************************************************************/
  
! void window_t::implementation_t::set_bounds(const point_t& position, const extents_t& geometry)
  {
  	assert(window_m);
***************
*** 1469,1473 ****
  #endif
  
! 	result.set(static_name_t("geometry"), rectangle_to_dictionary(geometry_m));
  	result.set(static_name_t("name"), window_title);
  
--- 1469,1473 ----
  #endif
  
! 	result.set(static_name_t("geometry"), extents_to_dictionary(geometry_m));
  	result.set(static_name_t("name"), window_title);
  
***************
*** 1623,1631 ****
  /****************************************************************************************************/
  
! rectangle_t	control_t::best_bounds()
  {
  	assert(control_m);
  
! 	rectangle_t	result;
  	metrics_t::get_instance().set_window(control_m);
  	//
--- 1623,1631 ----
  /****************************************************************************************************/
  
! extents_t	control_t::best_bounds()
  {
  	assert(control_m);
  
! 	extents_t	result;
  	metrics_t::get_instance().set_window(control_m);
  	//
***************
*** 1634,1638 ****
  	// anyway.
  	//
! 	if (!uxtheme_type_m) return rectangle_t();
  	//
  	// Discover the size of the widget.
--- 1634,1638 ----
  	// anyway.
  	//
! 	if (!uxtheme_type_m) return extents_t();
  	//
  	// Discover the size of the widget.
***************
*** 1671,1680 ****
  /****************************************************************************************************/
  
! void control_t::set_bounds(const point_t& pos, const rectangle_t& geo)
  {
  	assert(control_m);
  
  	point_t		position(pos);
! 	rectangle_t	geometry(geo);
  
  	RECT new_bounds =
--- 1671,1680 ----
  /****************************************************************************************************/
  
! void control_t::set_bounds(const point_t& pos, const extents_t& geo)
  {
  	assert(control_m);
  
  	point_t		position(pos);
! 	extents_t	geometry(geo);
  
  	RECT new_bounds =
***************
*** 1841,1845 ****
  
  	dictionary_t				result;
! 	rectangle_t					geometry;
  	RECT						bounds;
  
--- 1841,1845 ----
  
  	dictionary_t				result;
! 	extents_t					geometry;
  	RECT						bounds;
  
***************
*** 1851,1855 ****
  	result.set(static_name_t("widget_type"), std::string("control_core"));
  	result.set(static_name_t("theme"), theme_m);
! 	result.set(static_name_t("geometry"), rectangle_to_dictionary(geometry));
  
  	return result;
--- 1851,1855 ----
  	result.set(static_name_t("widget_type"), std::string("control_core"));
  	result.set(static_name_t("theme"), theme_m);
! 	result.set(static_name_t("geometry"), extents_to_dictionary(geometry));
  
  	return result;
***************
*** 1923,1933 ****
  /****************************************************************************************************/
  
! rectangle_t group_t::implementation_t::best_bounds()
  {
  	assert(control_m);
  
! 	rectangle_t	result(_super::best_bounds());
  
! 	result.slice_m[rectangle_slices_t::vertical].frame_m.first = result.height();
  
  	return result;
--- 1923,1933 ----
  /****************************************************************************************************/
  
! extents_t group_t::implementation_t::best_bounds()
  {
  	assert(control_m);
  
! 	extents_t	result(_super::best_bounds());
  
! 	result.slice_m[extents_slices_t::vertical].frame_m.first = result.height();
  
  	return result;
***************
*** 2030,2043 ****
  /****************************************************************************************************/
  
! rectangle_t tab_group_t::implementation_t::best_bounds()
  {
  	assert(control_m);
  
! 	rectangle_t	result;
  
  	// REVISIT (fbrereto) : Static values
  
  	result.height() = 15;
! 	result.slice_m[rectangle_slices_t::vertical].frame_m.first = 20;
  
  	return result;
--- 2030,2043 ----
  /****************************************************************************************************/
  
! extents_t tab_group_t::implementation_t::best_bounds()
  {
  	assert(control_m);
  
! 	extents_t	result;
  
  	// REVISIT (fbrereto) : Static values
  
  	result.height() = 15;
! 	result.slice_m[extents_slices_t::vertical].frame_m.first = 20;
  
  	return result;
***************
*** 2626,2630 ****
  /****************************************************************************************************/
  
! void link_t::implementation_t::set_bounds(const point_t& position, const rectangle_t& geometry)
  {
  	assert(control_m);
--- 2626,2630 ----
  /****************************************************************************************************/
  
! void link_t::implementation_t::set_bounds(const point_t& position, const extents_t& geometry)
  {
  	assert(control_m);
***************
*** 2634,2638 ****
  	prongs_m.erase(prongs_m.begin(), prongs_m.end());
  
! 	copy(geometry.slice_m[rectangle_slices_t::vertical].poi_m, std::back_inserter(prongs_m));
  }
  
--- 2634,2638 ----
  	prongs_m.erase(prongs_m.begin(), prongs_m.end());
  
! 	copy(geometry.slice_m[extents_slices_t::vertical].poi_m, std::back_inserter(prongs_m));
  }
  
***************
*** 2753,2757 ****
  /****************************************************************************************************/
  
! rectangle_t progress_bar_t::implementation_t::best_bounds()
  {
  	assert(control_m);
--- 2753,2757 ----
  /****************************************************************************************************/
  
! extents_t progress_bar_t::implementation_t::best_bounds()
  {
  	assert(control_m);
***************
*** 2761,2765 ****
  	//
  
! 	rectangle_t	result;
  	long		height(is_vertical_m ? 100 : 15);
  	long		width(is_vertical_m ? 15 : 100);
--- 2761,2765 ----
  	//
  
! 	extents_t	result;
  	long		height(is_vertical_m ? 100 : 15);
  	long		width(is_vertical_m ? 15 : 100);
***************
*** 2931,2935 ****
  	set_control_bounds(control_m, static_bounds);
  
! 	rectangle_t	best_bounds_result(_super::best_bounds());
  
  	return best_bounds_result.height();
--- 2931,2935 ----
  	set_control_bounds(control_m, static_bounds);
  
! 	extents_t	best_bounds_result(_super::best_bounds());
  
  	return best_bounds_result.height();
***************
*** 3092,3096 ****
  /****************************************************************************************************/
  
! rectangle_t edit_text_t::implementation_t::best_bounds()
  {
  	assert(control_m);
--- 3092,3096 ----
  /****************************************************************************************************/
  
! extents_t edit_text_t::implementation_t::best_bounds()
  {
  	assert(control_m);
***************
*** 3099,3103 ****
  	// should be, based on the number of rows and columns.
  	//
! 	rectangle_t result = calculate_edit_bounds(control_m, cols_m, rows_m);
  	//
  	// Store the height and baseline so that we can correctly align the edit widget
--- 3099,3103 ----
  	// should be, based on the number of rows and columns.
  	//
! 	extents_t result = calculate_edit_bounds(control_m, cols_m, rows_m);
  	//
  	// Store the height and baseline so that we can correctly align the edit widget
***************
*** 3105,3109 ****
  	//
  	edit_height_m = result.height();
! 	edit_baseline_m = result.slice_m[rectangle_slices_t::vertical].poi_m[0];
  	//
  	// If we have a label then we need to make extra space
--- 3105,3109 ----
  	//
  	edit_height_m = result.height();
! 	edit_baseline_m = result.slice_m[extents_slices_t::vertical].poi_m[0];
  	//
  	// If we have a label then we need to make extra space
***************
*** 3111,3120 ****
  	//
  	if (!using_label_m) return result;
! 	rectangle_t label_bounds = get_label().best_bounds();
  	//
  	// Make sure that the height can accomodate both the label
  	// and the edit widget.
  	//
! 	align_slices(result.slice_m[rectangle_slices_t::vertical], label_bounds.slice_m[rectangle_slices_t::vertical]);
  	//
  	// We put the label on the left side of the edit box, and
--- 3111,3120 ----
  	//
  	if (!using_label_m) return result;
! 	extents_t label_bounds = get_label().best_bounds();
  	//
  	// Make sure that the height can accomodate both the label
  	// and the edit widget.
  	//
! 	align_slices(result.slice_m[extents_slices_t::vertical], label_bounds.slice_m[extents_slices_t::vertical]);
  	//
  	// We put the label on the left side of the edit box, and
***************
*** 3123,3127 ****
  	//
  	result.width() += gap + label_bounds.width();
! 	result.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(label_bounds.width());
  	//
  	// We use the height and baseline of the label to size and
--- 3123,3127 ----
  	//
  	result.width() += gap + label_bounds.width();
! 	result.slice_m[extents_slices_t::horizontal].poi_m.push_back(label_bounds.width());
  	//
  	// We use the height and baseline of the label to size and
***************
*** 3129,3133 ****
  	//
  	static_height_m = label_bounds.height();
! 	static_baseline_m = label_bounds.slice_m[rectangle_slices_t::vertical].poi_m[0];
  	return result;
  }
--- 3129,3133 ----
  	//
  	static_height_m = label_bounds.height();
! 	static_baseline_m = label_bounds.slice_m[extents_slices_t::vertical].poi_m[0];
  	return result;
  }
***************
*** 3135,3147 ****
  /****************************************************************************************************/
  
! void edit_text_t::implementation_t::set_bounds(const point_t& pos, const rectangle_t& geo)
  {
  	assert(control_m);
  
  	point_t		position(pos);
! 	rectangle_t	geometry(geo);
  
  	geometry_m = geometry;
! 	long baseline = geometry.slice_m[rectangle_slices_t::vertical].poi_m[0];
  	if (using_label_m)
  	{
--- 3135,3147 ----
  /****************************************************************************************************/
  
! void edit_text_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geo)
  {
  	assert(control_m);
  
  	point_t		position(pos);
! 	extents_t	geometry(geo);
  
  	geometry_m = geometry;
! 	long baseline = geometry.slice_m[extents_slices_t::vertical].poi_m[0];
  	if (using_label_m)
  	{
***************
*** 3151,3155 ****
  		// correctly translate the label for baseline alignment.
  		//
! 		adobe::rectangle_t	label_geometry;
  		adobe::point_t		label_position(position);
  		//
--- 3151,3155 ----
  		// correctly translate the label for baseline alignment.
  		//
! 		adobe::extents_t	label_geometry;
  		adobe::point_t		label_position(position);
  		//
***************
*** 3159,3163 ****
  		//
  		label_geometry.height() = static_height_m;
! 		label_geometry.width() = geometry.slice_m[rectangle_slices_t::horizontal].poi_m[0];
  		//
  		// Translate the label vertically for baseline alignment with the
--- 3159,3163 ----
  		//
  		label_geometry.height() = static_height_m;
! 		label_geometry.width() = geometry.slice_m[extents_slices_t::horizontal].poi_m[0];
  		//
  		// Translate the label vertically for baseline alignment with the
***************
*** 3203,3207 ****
  			long		top(bounds.top);
  			long		left(bounds.left);
! 			rectangle_t	rect;
  			point_t		position(left + left_adjust, top);
  
--- 3203,3207 ----
  			long		top(bounds.top);
  			long		left(bounds.left);
! 			extents_t	rect;
  			point_t		position(left + left_adjust, top);
  
***************
*** 3433,3440 ****
  /****************************************************************************************************/
  
! rectangle_t popup_t::implementation_t::best_bounds()
  {
  	assert(control_m);
! 	rectangle_t result;
  	//
  	// Make sure that metrics_t is initialized.
--- 3433,3440 ----
  /****************************************************************************************************/
  
! extents_t popup_t::implementation_t::best_bounds()
  {
  	assert(control_m);
! 	extents_t result;
  	//
  	// Make sure that metrics_t is initialized.
***************
*** 3511,3515 ****
  			if (have_border) baseline += border;
  		}
! 		result.slice_m[rectangle_slices_t::vertical].poi_m.push_back(baseline);
  	} else ADOBE_THROW_LAST_ERROR;
  	//
--- 3511,3515 ----
  			if (have_border) baseline += border;
  		}
! 		result.slice_m[extents_slices_t::vertical].poi_m.push_back(baseline);
  	} else ADOBE_THROW_LAST_ERROR;
  	//
***************
*** 3526,3532 ****
  	// the widgets in set_bounds.
  	//
! 	rectangle_t label_bounds = get_label().best_bounds();
  	static_height_m = label_bounds.height();
! 	static_baseline_m = label_bounds.slice_m[rectangle_slices_t::vertical].poi_m[0];
  	//
  	// Now we can align the label within the vertical
--- 3526,3532 ----
  	// the widgets in set_bounds.
  	//
! 	extents_t label_bounds = get_label().best_bounds();
  	static_height_m = label_bounds.height();
! 	static_baseline_m = label_bounds.slice_m[extents_slices_t::vertical].poi_m[0];
  	//
  	// Now we can align the label within the vertical
***************
*** 3534,3538 ****
  	// the label is shorter than the popup.
  	//
! 	align_slices(result.slice_m[rectangle_slices_t::vertical], label_bounds.slice_m[rectangle_slices_t::vertical]);
  	//
  	// Add the width of the label (plus a gap) to the
--- 3534,3538 ----
  	// the label is shorter than the popup.
  	//
! 	align_slices(result.slice_m[extents_slices_t::vertical], label_bounds.slice_m[extents_slices_t::vertical]);
  	//
  	// Add the width of the label (plus a gap) to the
***************
*** 3544,3548 ****
  	// We put the label to the left of the popup.
  	//
! 	result.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(label_bounds.width());
  	return result;;
  }
--- 3544,3548 ----
  	// We put the label to the left of the popup.
  	//
! 	result.slice_m[extents_slices_t::horizontal].poi_m.push_back(label_bounds.width());
  	return result;;
  }
***************
*** 3550,3554 ****
  /****************************************************************************************************/
  
! void popup_t::implementation_t::set_bounds(const point_t& pos, const rectangle_t& geometry)
  {
  	assert(control_m);
--- 3550,3554 ----
  /****************************************************************************************************/
  
! void popup_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geometry)
  {
  	assert(control_m);
***************
*** 3566,3571 ****
  		// baseline - the label's baseline.
  		//
! 		assert(!geometry_m.slice_m[rectangle_slices_t::vertical].poi_m.empty());
! 		long baseline = geometry_m.slice_m[rectangle_slices_t::vertical].poi_m[0];
  		//
  		// Apply the vertical offset.
--- 3566,3571 ----
  		// baseline - the label's baseline.
  		//
! 		assert(!geometry_m.slice_m[extents_slices_t::vertical].poi_m.empty());
! 		long baseline = geometry_m.slice_m[extents_slices_t::vertical].poi_m[0];
  		//
  		// Apply the vertical offset.
***************
*** 3576,3582 ****
  		// point of interest.
  		//
! 		rectangle_t label_size;
! 		assert(!geometry_m.slice_m[rectangle_slices_t::horizontal].poi_m.empty());
! 		label_size.width() = geometry_m.slice_m[rectangle_slices_t::horizontal].poi_m[0];
  		label_size.height() = static_height_m;
  		//
--- 3576,3582 ----
  		// point of interest.
  		//
! 		extents_t label_size;
! 		assert(!geometry_m.slice_m[extents_slices_t::horizontal].poi_m.empty());
! 		label_size.width() = geometry_m.slice_m[extents_slices_t::horizontal].poi_m[0];
  		label_size.height() = static_height_m;
  		//
***************
*** 3624,3628 ****
  			long		left(bounds.left);
  			point_t		position(left + left_adjust, top + top_adjust);
! 			rectangle_t	rect;
  
  			rect.height() = bounds.bottom - bounds.top;
--- 3624,3628 ----
  			long		left(bounds.left);
  			point_t		position(left + left_adjust, top + top_adjust);
! 			extents_t	rect;
  
  			rect.height() = bounds.bottom - bounds.top;
***************
*** 3836,3843 ****
  /****************************************************************************************************/
  
! rectangle_t unit_edit_text_t::implementation_t::best_bounds()
  {
  	assert(control_m);
! 	rectangle_t result(_super::best_bounds());
  	//
  	// Store the height of the edit widget in case the
--- 3836,3843 ----
  /****************************************************************************************************/
  
! extents_t unit_edit_text_t::implementation_t::best_bounds()
  {
  	assert(control_m);
! 	extents_t result(_super::best_bounds());
  	//
  	// Store the height of the edit widget in case the
***************
*** 3846,3850 ****
  	//
  	edit_height_m = result.height();
! 	edit_baseline_m = result.slice_m[rectangle_slices_t::vertical].poi_m[0];
  	//
  	// We need to discover the maximum size which we could
--- 3846,3850 ----
  	//
  	edit_height_m = result.height();
! 	edit_baseline_m = result.slice_m[extents_slices_t::vertical].poi_m[0];
  	//
  	// We need to discover the maximum size which we could
***************
*** 3854,3859 ****
  	if (using_popup_m)
  	{
! 		rectangle_t popup_size = popup_m.best_bounds();
! 		align_slices(result.slice_m[rectangle_slices_t::vertical], popup_size.slice_m[rectangle_slices_t::vertical]);
  		//
  		// We need to store a point of interest at the
--- 3854,3859 ----
  	if (using_popup_m)
  	{
! 		extents_t popup_size = popup_m.best_bounds();
! 		align_slices(result.slice_m[extents_slices_t::vertical], popup_size.slice_m[extents_slices_t::vertical]);
  		//
  		// We need to store a point of interest at the
***************
*** 3862,3866 ****
  		// a gap).
  		//
! 		result.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(result.width());
  		result.width() += gap + popup_size.width();
  		//
--- 3862,3866 ----
  		// a gap).
  		//
! 		result.slice_m[extents_slices_t::horizontal].poi_m.push_back(result.width());
  		result.width() += gap + popup_size.width();
  		//
***************
*** 3869,3873 ****
  		//
  		popup_height_m = popup_size.height();
! 		popup_baseline_m = popup_size.slice_m[rectangle_slices_t::vertical].poi_m[0];
  	}
  	return result;
--- 3869,3873 ----
  		//
  		popup_height_m = popup_size.height();
! 		popup_baseline_m = popup_size.slice_m[extents_slices_t::vertical].poi_m[0];
  	}
  	return result;
***************
*** 3876,3888 ****
  /****************************************************************************************************/
  
! void unit_edit_text_t::implementation_t::set_bounds(const point_t& pos, const rectangle_t& geometry)
  {
  	assert(control_m);
  
  	point_t 		position(pos);
! 	adobe::rectangle_t	edit_geometry;
! 	adobe::rectangle_t	copy_geometry(geometry);
  	adobe::point_t		edit_position(pos);
! 	long			baseline(geometry.slice_m[rectangle_slices_t::vertical].poi_m[0]);
  	//
  	// If our edit widget has a label, then we need to put the
--- 3876,3888 ----
  /****************************************************************************************************/
  
! void unit_edit_text_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geometry)
  {
  	assert(control_m);
  
  	point_t 		position(pos);
! 	adobe::extents_t	edit_geometry;
! 	adobe::extents_t	copy_geometry(geometry);
  	adobe::point_t		edit_position(pos);
! 	long			baseline(geometry.slice_m[extents_slices_t::vertical].poi_m[0]);
  	//
  	// If our edit widget has a label, then we need to put the
***************
*** 3891,3900 ****
  	//
  	if (using_label_m) {
! 		edit_geometry.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m[0]);
! 		edit_geometry.slice_m[rectangle_slices_t::vertical].poi_m.push_back(edit_baseline_m);
  		//
  		// We don't need the edit's point of interest any more.
  		//
! 		copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m.erase(copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m.begin());
  	}
  	//
--- 3891,3900 ----
  	//
  	if (using_label_m) {
! 		edit_geometry.slice_m[extents_slices_t::horizontal].poi_m.push_back(copy_geometry.slice_m[extents_slices_t::horizontal].poi_m[0]);
! 		edit_geometry.slice_m[extents_slices_t::vertical].poi_m.push_back(edit_baseline_m);
  		//
  		// We don't need the edit's point of interest any more.
  		//
! 		copy_geometry.slice_m[extents_slices_t::horizontal].poi_m.erase(copy_geometry.slice_m[extents_slices_t::horizontal].poi_m.begin());
  	}
  	//
***************
*** 3917,3925 ****
  		// popup.
  		//
! 		adobe::rectangle_t	popup_geometry;
  		adobe::point_t		popup_position(pos);
  
! 		popup_geometry.width() = copy_geometry.slice_m[rectangle_slices_t::horizontal].length_m -
! 			copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m[0];
  		popup_geometry.height() = popup_height_m;
  		//
--- 3917,3925 ----
  		// popup.
  		//
! 		adobe::extents_t	popup_geometry;
  		adobe::point_t		popup_position(pos);
  
! 		popup_geometry.width() = copy_geometry.slice_m[extents_slices_t::horizontal].length_m -
! 			copy_geometry.slice_m[extents_slices_t::horizontal].poi_m[0];
  		popup_geometry.height() = popup_height_m;
  		//
***************
*** 4097,4103 ****
  /****************************************************************************************************/
  
! rectangle_t slider_t::implementation_t::best_bounds()
  {
! 	rectangle_t result;
  	//
  	// Get the size of the thumb, and then multiply it by the number of tick
--- 4097,4103 ----
  /****************************************************************************************************/
  
! extents_t slider_t::implementation_t::best_bounds()
  {
! 	extents_t result;
  	//
  	// Get the size of the thumb, and then multiply it by the number of tick
***************
*** 4415,4419 ****
  /****************************************************************************************************/
  
! void hitless_t::implementation_t::set_bounds(const point_t&, const rectangle_t&)
  {
  	/* do nothing on Win for now */
--- 4415,4419 ----
  /****************************************************************************************************/
  
! void hitless_t::implementation_t::set_bounds(const point_t&, const extents_t&)
  {
  	/* do nothing on Win for now */
***************
*** 4467,4471 ****
  #ifndef NDEBUG
  
! void frame_geometry(window_t& window, const point_t& position, const rectangle_t& geometry)
  {
  #if 0
--- 4467,4471 ----
  #ifndef NDEBUG
  
! void frame_geometry(window_t& window, const point_t& position, const extents_t& geometry)
  {
  #if 0
***************
*** 4500,4505 ****
  
  		{
! 		points_of_interest_t::const_iterator iter(geometry.slice_m[rectangle_slices_t::horizontal].poi_m.begin());
! 		points_of_interest_t::const_iterator last(geometry.slice_m[rectangle_slices_t::horizontal].poi_m.end());
  		for (; iter != last; ++iter)
  		{
--- 4500,4505 ----
  
  		{
! 		points_of_interest_t::const_iterator iter(geometry.slice_m[extents_slices_t::horizontal].poi_m.begin());
! 		points_of_interest_t::const_iterator last(geometry.slice_m[extents_slices_t::horizontal].poi_m.end());
  		for (; iter != last; ++iter)
  		{
***************
*** 4515,4520 ****
  
  		{
! 		points_of_interest_t::const_iterator iter(geometry.slice_m[rectangle_slices_t::vertical].poi_m.begin());
! 		points_of_interest_t::const_iterator last(geometry.slice_m[rectangle_slices_t::vertical].poi_m.end());
  		for (; iter != last; ++iter)
  		{
--- 4515,4520 ----
  
  		{
! 		points_of_interest_t::const_iterator iter(geometry.slice_m[extents_slices_t::vertical].poi_m.begin());
! 		points_of_interest_t::const_iterator last(geometry.slice_m[extents_slices_t::vertical].poi_m.end());
  		for (; iter != last; ++iter)
  		{