[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/sources client_assembler.cpp,1.5,1.6 ui_core.cpp,1.3,1.4

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

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

Modified Files:
	client_assembler.cpp ui_core.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.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/ui_core.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ui_core.cpp	3 Apr 2005 00:31:31 -0000	1.3
--- ui_core.cpp	10 Apr 2005 01:24:36 -0000	1.4
***************
*** 652,657 ****
  	{ delete object_m; }
  
! void edit_text_t::initialize(const std::string& name, bool scrollable)
! 	{ object_m->initialize(initial_bounds_g, name, scrollable); }
  
  rectangle_t edit_text_t::best_bounds()
--- 652,657 ----
  	{ delete object_m; }
  
! void edit_text_t::initialize(const std::string& name, bool scrollable, long cols, long rows)
! 	{ object_m->initialize(initial_bounds_g, name, scrollable, cols, rows); }
  
  rectangle_t edit_text_t::best_bounds()
***************
*** 688,694 ****
  	{ object_m->set_static_disabled(is_static_disabled); }
  
- void edit_text_t::set_row_col_count(long columns, long rows)
- 	{ object_m->set_row_col_count(columns, rows); }
- 
  void edit_text_t::set_selection(long start_char, long end_char)
  	{ object_m->set_selection(start_char, end_char); }
--- 688,691 ----
***************
*** 795,800 ****
  	{ delete object_m; }
  
! void unit_edit_text_t::initialize(const std::string& name, bool using_popup)
! 	{ object_m->initialize(initial_bounds_g, name, using_popup); }
  
  rectangle_t unit_edit_text_t::best_bounds()
--- 792,797 ----
  	{ delete object_m; }
  
! void unit_edit_text_t::initialize(const std::string& name, long cols, long rows, bool using_popup)
! 	{ object_m->initialize(initial_bounds_g, name, using_popup, cols, rows); }
  
  rectangle_t unit_edit_text_t::best_bounds()
***************
*** 831,837 ****
  	{ object_m->set_static_disabled(is_static_disabled); }
  
- void unit_edit_text_t::set_row_col_count(long columns, long rows)
- 	{ object_m->set_row_col_count(columns, rows); }
- 
  void unit_edit_text_t::set_selection(long start_char, long end_char)
  	{ object_m->set_selection(start_char, end_char); }
--- 828,831 ----

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/client_assembler.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** client_assembler.cpp	31 Mar 2005 01:37:33 -0000	1.5
--- client_assembler.cpp	10 Apr 2005 01:24:35 -0000	1.6
***************
*** 1592,1596 ****
  	edit_active_ref_m = &assemblage_m->hold_connection(adobe::assemblage_t::connection_t());
  
! 	control_m.initialize(name_m, scrollable);
  
  	set_up_control(*this, control_m, *parent, token);
--- 1592,1596 ----
  	edit_active_ref_m = &assemblage_m->hold_connection(adobe::assemblage_t::connection_t());
  
! 	control_m.initialize(name_m, scrollable, characters_m, num_lines_m);
  
  	set_up_control(*this, control_m, *parent, token);
***************
*** 1601,1606 ****
  		control_m.signal_label_hit(boost::bind(&edit_text_proxy_t::edit_text_label_hit, boost::ref(*this), _1));
  
- 	control_m.set_row_col_count(characters_m, num_lines_m);
- 
  	if (bind_indirect_m)
  	{
--- 1601,1604 ----
***************
*** 1835,1839 ****
  	static_active_ref_m = &assemblage_m->hold_connection(adobe::assemblage_t::connection_t());
  
! 	control_m.initialize(name_m, units_m.size());
  
  	control_m.set_static_disabled(go_static_m);
--- 1833,1837 ----
  	static_active_ref_m = &assemblage_m->hold_connection(adobe::assemblage_t::connection_t());
  
! 	control_m.initialize(name_m, units_m.size(), digits_m, 1);
  
  	control_m.set_static_disabled(go_static_m);
***************
*** 1847,1852 ****
  		control_m.signal_label_hit(boost::bind(&edit_number_proxy_t::edit_number_label_hit, boost::ref(*this), _1));
  
- 	control_m.set_row_col_count(digits_m, 1);
- 
  	control_m.signal_pre_edit(boost::bind(&edit_number_proxy_t::edit_number_value_changed, boost::ref(*this), _1, _2));
  	control_m.signal_post_edit(boost::bind(&edit_number_proxy_t::control_value, boost::ref(*this), _1));
--- 1845,1848 ----