[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 BON2Engine.cpp,1.2,1.3

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004
In directory braindrain:/tmp/cvs-serv6427

Modified Files:
	BON2Engine.cpp 
Log Message:
Notification (warning) about similar aspect names, improved handling.

Attribute values are valid (thus considered) from now on if status >= HERE ( status might be DERIVED1, DERIVED2, ...)

Silent mode for the name selection dialog box.


CVS User: zolmol

Index: BON2Engine.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Engine.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BON2Engine.cpp	2 Aug 2004 18:28:21 -0000	1.2
--- BON2Engine.cpp	19 Aug 2004 18:29:50 -0000	1.3
***************
*** 726,731 ****
  	}
  
! 	res = false;
! 	if( !dlg->m_dn.empty())	res = dlg->DoModal() == IDOK;
  	if( res)
  	{
--- 726,747 ----
  	}
  
! #ifdef NOUSERINPUT
! 	{
! 		res = true;
! 		dlg->m_result = dlg->m_dn;
! 	}
! #else
! 	if( global_vars.silent_mode)
! 	{
! 		res = true;
! 		dlg->m_result = dlg->m_dn;
! 	}
! 	else
! 	{
! 		res = false;
! 		if( !dlg->m_dn.empty())	res = dlg->DoModal() == IDOK;
! 	}
! #endif
! 
  	if( res)
  	{