[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/sources/mac ui_core_implementation.cpp,1.6,1.7

[Ralph T. <ra...@us...>]

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

Modified Files:
	ui_core_implementation.cpp 
Log Message:
multiline edit_text_t now works on Win32! I *think* that means that Windows now has all of the required widgets for Adobe Begin as it currently stands.

This check-in changes the ui-core interface. I have removed the set_row_col_count function from edit_text_t. It made a Win32 implementation very hard, as you cannot go between a single- and multi-line edit control on Windows (at least, not without destroying the control and creating a new one, which is a hack). This change meant that changes had to be made to the Mac ui-core implementation.

Index: ui_core_implementation.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/mac/ui_core_implementation.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ui_core_implementation.cpp	31 Mar 2005 22:50:44 -0000	1.6
--- ui_core_implementation.cpp	10 Apr 2005 01:24:36 -0000	1.7
***************
*** 3637,3643 ****
  /****************************************************************************************************/
  
! void edit_text_t::implementation_t::initialize(	const Rect&			bounds,
! 												const std::string&	name,
! 												bool				scrollable)
  {
  	assert(!control_m);
--- 3637,3645 ----
  /****************************************************************************************************/
  
! void edit_text_t::implementation_t::initialize(	const Rect&		bounds,
! 						const std::string&	name,
! 						bool			scrollable,
! 						long			cols,
! 						long			rows)
  {
  	assert(!control_m);
***************
*** 3645,3648 ****
--- 3647,3652 ----
  	scrollable_m = scrollable;
  	using_label_m = !name.empty();
+ 	cols_m = cols;
+ 	rows_m = rows;
  
  	if (scrollable)
***************
*** 3725,3728 ****
--- 3729,3735 ----
  		get_label().adorn_theme(theme_adornment_label_s);
  	}
+ 	if (!scroll_control_m)
+ 		set_widget_data(control_m, kControlEditTextPart,
+ 						kControlEditTextSingleLineTag, Boolean(rows_m <= 1));
  }
  
***************
*** 3950,3967 ****
  /****************************************************************************************************/
  
- void edit_text_t::implementation_t::set_row_col_count(long columns, long rows)
- {
- 	assert(control_m);
- 
- 	cols_m = columns;
- 	rows_m = rows;
- 
- 	if (!scroll_control_m)
- 		set_widget_data(control_m, kControlEditTextPart,
- 						kControlEditTextSingleLineTag, Boolean(rows_m <= 1));
- }
- 
- /****************************************************************************************************/
- 
  void edit_text_t::implementation_t::set_selection(long start_char, long end_char)
  {
--- 3957,3960 ----
***************
*** 4356,4362 ****
  /****************************************************************************************************/
  
! void unit_edit_text_t::implementation_t::initialize(const Rect&			bounds,
! 													const std::string&	name,
! 													bool				using_popup)
  {
  	assert(!control_m);
--- 4349,4357 ----
  /****************************************************************************************************/
  
! void unit_edit_text_t::implementation_t::initialize(	const Rect&		bounds,
! 							const std::string&	name,
! 							bool			using_popup,
! 							long			cols,
! 							long			rows)
  {
  	assert(!control_m);
***************
*** 4364,4368 ****
  	using_popup_m = using_popup;
  
! 	_super::initialize(bounds, name, false);
  
  	if (using_popup_m)
--- 4359,4363 ----
  	using_popup_m = using_popup;
  
! 	_super::initialize(bounds, name, false, cols, rows);
  
  	if (using_popup_m)