[adobe-source-commits] sandbox/visual_refactor/adobe/test/visual/headers factory.hpp,1.4,1.5

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

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

Modified Files:
	factory.hpp 
Log Message:
The widget size now comes from the parent by default (rather than from the token).

Index: factory.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/factory.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** factory.hpp	22 Apr 2005 07:32:51 -0000	1.4
--- factory.hpp	22 Apr 2005 20:17:08 -0000	1.5
***************
*** 47,51 ****
  struct factory_token_t
  {
! 	factory_token_t(display_t& display, assemblage_t& assemblage, eve_t& layout, sheet_t& sheet, eve_client::button_notifier_t notifier, eve_client::serialize_signal_t& serialize_signal, eve_client::show_window_signal_t& show_signal, size_enum_t dialog_size) :
  		display_m(display),
  		assemblage_m(assemblage),
--- 47,51 ----
  struct factory_token_t
  {
! 	factory_token_t(display_t& display, assemblage_t& assemblage, eve_t& layout, sheet_t& sheet, eve_client::button_notifier_t notifier, eve_client::serialize_signal_t& serialize_signal, eve_client::show_window_signal_t& show_signal) :
  		display_m(display),
  		assemblage_m(assemblage),
***************
*** 90,97 ****
  	eve_client::serialize_signal_t& widget_stream_m;
  	//
- 	/// This specifies the size of the widgets to be used in the window.
- 	//
- 	size_enum_t	dialog_size_m;
- 	//
  	/// Top-level widgets (windows, dialogs, etc) need to be told to show themselves
  	/// when all of the child widgets have been created and inserted. This signal
--- 90,93 ----
***************
*** 109,116 ****
  struct widget_node_t
  {
! 	widget_node_t(const eve_t::iterator& eve_token, const display_t::position_t& display_token)
! 		: eve_token_m(eve_token), display_token_m(display_token)
  	{ }
  	//
  	/// The parent as known by Eve.
  	//
--- 105,117 ----
  struct widget_node_t
  {
! 	widget_node_t(size_enum_t size, const eve_t::iterator& eve_token, const display_t::position_t& display_token)
! 		: size_m(size), eve_token_m(eve_token), display_token_m(display_token)
  	{ }
  	//
+ 	/// This specifies the size of this widget. Children will use this to find the
+ 	/// size they should use (unless they have an explicit size specified).
+ 	//
+ 	size_enum_t	size_m;
+ 	//
  	/// The parent as known by Eve.
  	//