[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/headers/win ui_core_implementation.hpp,1.9,1.10

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

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

Modified Files:
	ui_core_implementation.hpp 
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.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win/ui_core_implementation.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ui_core_implementation.hpp	8 Apr 2005 21:03:50 -0000	1.9
--- ui_core_implementation.hpp	10 Apr 2005 01:24:35 -0000	1.10
***************
*** 426,431 ****
  
  	void			initialize(	const RECT&			bounds,
! 								const std::string&	name,
! 								bool				scrollable);
  	static_text_t&			get_label();
  	virtual rectangle_t		best_bounds();
--- 426,433 ----
  
  	void			initialize(	const RECT&			bounds,
! 						const std::string&		name,
! 						bool				scrollable,
! 						long				cols,
! 						long				rows);
  	static_text_t&			get_label();
  	virtual rectangle_t		best_bounds();
***************
*** 436,444 ****
  	void					set_field_text(const std::string& text);
  	void					set_static_disabled(bool is_static_disabled);
- 	void					set_row_col_count(long columns, long rows);
  	void					set_selection(long start_char, long end_char);
  	void					signal_pre_edit(const implementation::edit_text_pre_edit_proc_t& proc);
  	void					signal_post_edit(const implementation::edit_text_post_edit_proc_t& proc);
  	void					signal_label_hit(const implementation::edit_text_label_hit_proc_t& proc);
  	virtual LRESULT				event(UINT msg, WPARAM wParam, LPARAM lParam);
  
--- 438,452 ----
  	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& proc);
  	void					signal_post_edit(const implementation::edit_text_post_edit_proc_t& proc);
  	void					signal_label_hit(const implementation::edit_text_label_hit_proc_t& proc);
+ 	//
+ 	/// Recalculate the style which should be given as the Window style
+ 	/// of the edit control.
+ 	///
+ 	/// \return	the window style which should be applied to control_m.
+ 	//
+ 	long					get_window_style() const;
  	virtual LRESULT				event(UINT msg, WPARAM wParam, LPARAM lParam);
  
***************
*** 516,522 ****
  	implementation_t(const implementation_t& rhs);
  
! 	void					initialize(	const RECT&			bounds,
! 										const std::string&	name,
! 										bool				using_popup);
  	popup_t&				get_popup();
  	virtual rectangle_t		best_bounds();
--- 524,532 ----
  	implementation_t(const implementation_t& rhs);
  
! 	void					initialize(	const RECT&		bounds,
! 								const std::string&	name,
! 								bool			using_popup,
! 								long			cols,
! 								long			rows);
  	popup_t&				get_popup();
  	virtual rectangle_t		best_bounds();