[adobe-source-commits] sandbox/adobe-source/adobe/future/widgets/sources client_assembler.cpp,1.7,1.8 ui_core.cpp,1.5,1.6 ui_core_common.cpp,1.6,1.7

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

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/sources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12473/adobe-source/adobe/future/widgets/sources

Modified Files:
	client_assembler.cpp ui_core.cpp ui_core_common.cpp 
Log Message:
moved win/ directories to win32/ to anticipate a possible widgets port for WPF; added a 'mini-sheet' to Eve so you can save UI state information (what tab is currently selected) without mucking up your Adam model; started the modal_dialog_interface, an API that'll be used to direct a modal dialog interaction between the user and the application (it's still in its infancy); other misc bug fixes

Index: ui_core_common.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/sources/ui_core_common.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ui_core_common.cpp	6 Jan 2006 18:02:59 -0000	1.6
--- ui_core_common.cpp	24 Jan 2006 19:38:47 -0000	1.7
***************
*** 78,81 ****
--- 78,101 ----
  /****************************************************************************************************/
  
+ ui_core_error_handler_proc_t& ui_core_error_handler()
+ {
+ 	static ui_core_error_handler_proc_t ui_core_error_handler_proc_s;
+ 
+ 	return ui_core_error_handler_proc_s;
+ }
+ 
+ /****************************************************************************************************/
+ 
+ void report_ui_element_error(const std::string& error)
+ {
+ 	ui_core_error_handler_proc_t& proc(ui_core_error_handler());
+ 
+ 	if (proc.empty()) return;
+ 
+ 	proc(error);
+ }
+ 
+ /****************************************************************************************************/
+ 
  } // namespace adobe
  

Index: ui_core.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/sources/ui_core.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ui_core.cpp	6 Jan 2006 18:02:59 -0000	1.5
--- ui_core.cpp	24 Jan 2006 19:38:47 -0000	1.6
***************
*** 9,12 ****
--- 9,13 ----
  #include "ui_core.hpp"
  #include "ui_core_implementation.hpp"
+ #include "ui_core_common.hpp"
  
  #include <adobe/value.hpp>
***************
*** 46,49 ****
--- 47,57 ----
  /****************************************************************************************************/
  
+ void set_ui_core_error_handler(ui_core_error_handler_proc_t proc)
+ {
+ 	ui_core_error_handler() = proc;
+ }
+ 
+ /****************************************************************************************************/
+ 
  void system_beep()
  {

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/sources/client_assembler.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** client_assembler.cpp	6 Jan 2006 18:02:59 -0000	1.7
--- client_assembler.cpp	24 Jan 2006 19:38:47 -0000	1.8
***************
*** 270,273 ****
--- 270,282 ----
  	virtual ~client_proxy_t()
  	{ }
+     
+     /*
+         REVISIT (sparent) : late_bind is a HACK - here is the issue, a basic seet calls the monitor
+         function  when set to make sure the item being connected to the sheet is aware of the 
+         current value. For an optinal panel this sets visibility - be the panel isn't yet connected 
+         to the layout! Need to think through the proper ordering here...
+     */
[...1182 lines suppressed...]
! 												notifier
  												);
! 
! 	adobe::virtual_machine_t evaluator;
! 	/*
! 		We set the initial parent to be the root of the main display, an
! 		empty eve iterator and the given dialog size.
! 	*/
! 	adobe::parse(stream, adobe::line_position_t(file_path, getline_proc),
! 			adobe::widget_node_t(dialog_size, adobe::eve_t::iterator(), adobe::get_main_display().root()
! #ifndef NDEBUG
! 				, adobe::ui_overlay_t::position_t()
! #endif
! 				),
! 			bind_layout(boost::bind(&client_assembler, boost::ref(token), _1, _2, _3, factory),
! 			result->layout_sheet_m, evaluator));
  	
  	result->contributing_m = sheet.contributing();
  
  	return result;