[GME-commit] GMESRC/GME/Search SearchDlg.cpp,1.18,1.19

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

Update of /project/gme-repository/GMESRC/GME/Search
In directory escher:/tmp/cvs-serv21321

Modified Files:
	SearchDlg.cpp 
Log Message:
Folder children (if non-models) are shown in Browser if the user doubleclicks on it.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: SearchDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/SearchDlg.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SearchDlg.cpp	2 May 2006 22:05:59 -0000	1.18
--- SearchDlg.cpp	5 May 2006 19:15:34 -0000	1.19
***************
*** 440,443 ****
--- 440,446 ----
  		try
  		{
+ 			// non-model children of Folders can't be shown, only located
+ 			bool must_do_locate = false;
+ 
  			TheCtrl->BeginTransaction();
  
***************
*** 448,452 ****
--- 451,467 ----
  			{
  				COMTHROW(results->get_Item(selected,&selectedFCO)); // crashed probably when called with 0
+ 
+ 				CComPtr<IMgaFolder> parent;
+ 				COMTHROW( selectedFCO->get_ParentFolder( &parent));
+ 				if( parent)
+ 				{
+ 					objtype_enum objtp;
+ 					COMTHROW( selectedFCO->get_ObjType( &objtp));
+ 					if( objtp != OBJTYPE_MODEL)
+ 						must_do_locate = true; // can't show it otherwise 
+ 				}
+ 
  				
+ 
  				//want to be able to search for references to this object in the special search
  				CBstr bstr;
***************
*** 464,468 ****
  			if( selectedObject)
  			{
! 				if( m_chkLocate) TheCtrl->LocateMgaObject(selectedObject);
  				else             TheCtrl->DblClickOnObject(selectedObject);
  			}
--- 479,483 ----
  			if( selectedObject)
  			{
! 				if( m_chkLocate || must_do_locate) TheCtrl->LocateMgaObject(selectedObject);
  				else             TheCtrl->DblClickOnObject(selectedObject);
  			}