[GME-commit] GMESRC/GME/GMEActiveBrowser ActiveBrowserPropertyPage.cpp,1.53,1.54

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

Update of /project/gme-repository/GMESRC/GME/GMEActiveBrowser
In directory escher:/tmp/cvs-serv799

Modified Files:
	ActiveBrowserPropertyPage.cpp 
Log Message:
MetaPropertyPage handles folders slightly different. Controls are not disabled, just left empty. Allow easy traversal of pages (through ctrl+tab cycling, without the focus wandering away).


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: ActiveBrowserPropertyPage.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** ActiveBrowserPropertyPage.cpp	6 Dec 2006 20:47:52 -0000	1.53
--- ActiveBrowserPropertyPage.cpp	6 Dec 2006 20:53:31 -0000	1.54
***************
*** 2675,2688 ****
  	
  
  	if(!pParent->m_PageAggregate.m_TreeAggregate.GetSelectedItemProxy(MgaObjectProxy)
! 		|| pParent->m_PageAggregate.m_TreeAggregate.GetRootItem()==\
! 			pParent->m_PageAggregate.m_TreeAggregate.GetSelectedItem()
! 		)
  	{
  		// No selection in the aggregate tree - or root wa selected
  		m_TreeInheritance.CleanUp();
  		m_ComboSearchCtrl.ResetContent();
! 		m_TreeInheritance.EnableWindow(FALSE);
! 		m_ComboSearchCtrl.EnableWindow(FALSE);
  		return;
  	}
--- 2675,2692 ----
  	
  
+ 	// condition modified> inheritance tree empty for all folders
+ 	// previously was empty for rootfolder only
  	if(!pParent->m_PageAggregate.m_TreeAggregate.GetSelectedItemProxy(MgaObjectProxy)
! 	|| MgaObjectProxy.m_TypeInfo == OBJTYPE_FOLDER) // all folders, by zolmol
  	{
  		// No selection in the aggregate tree - or root wa selected
  		m_TreeInheritance.CleanUp();
  		m_ComboSearchCtrl.ResetContent();
! 		//m_TreeInheritance.EnableWindow(FALSE);
! 		//m_ComboSearchCtrl.EnableWindow(FALSE);
! 		// previously disabled, but let's not do that anymore, 
! 		// thus we allow seamless CTRL+TABbing through the PropertyPages
! 		// without the focus wandering away from the tree ctrl
! 		// by zolmol
  		return;
  	}