[GME-commit] GMESRC/GME/Gme GMESearch.cpp,1.7,1.8 GMESearch.h,1.5,1.6

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

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv18123

Modified Files:
	GMESearch.cpp GMESearch.h 
Log Message:
Searchbox can show found objects in the Browser.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMESearch.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMESearch.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GMESearch.h	17 Mar 2006 15:55:22 -0000	1.5
--- GMESearch.h	2 May 2006 22:04:50 -0000	1.6
***************
*** 46,49 ****
--- 46,50 ----
  	afx_msg void OnDblClickMgaObjectSearchctrl(LPUNKNOWN mgaObject);
  	afx_msg void OnWantToBeClosedSearchctrl();
+ 	afx_msg void OnLocateMgaObjectSearchctrl(LPCTSTR mgaObjectId);
  	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
  	afx_msg void OnSizing(UINT fwSide, LPRECT pRect);
***************
*** 58,61 ****
--- 59,63 ----
  	void ShowObject(LPUNKNOWN selected);
  	void SelectObject(LPUNKNOWN mgaObject);
+ 	void LocateObject(LPCTSTR mgaObjectId);
  };
  

Index: GMESearch.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMESearch.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GMESearch.cpp	17 Mar 2006 15:55:22 -0000	1.7
--- GMESearch.cpp	2 May 2006 22:04:50 -0000	1.8
***************
*** 59,62 ****
--- 59,63 ----
  	ON_EVENT(CGMESearch, IDC_SEARCHCTRL, 2 /* DblClickMgaObject */, OnDblClickMgaObjectSearchctrl, VTS_UNKNOWN)
  	ON_EVENT(CGMESearch, IDC_SEARCHCTRL, 3 /* WantToBeClosed */, OnWantToBeClosedSearchctrl, VTS_NONE)
+ 	ON_EVENT(CGMESearch, IDC_SEARCHCTRL, 4 /* LocateMgaObject */, OnLocateMgaObjectSearchctrl, VTS_BSTR)
  	//}}AFX_EVENTSINK_MAP
  END_EVENTSINK_MAP()
***************
*** 80,83 ****
--- 81,89 ----
  }
  
+ void CGMESearch::OnLocateMgaObjectSearchctrl(LPCTSTR mgaObjectId) 
+ {
+ 	LocateObject( mgaObjectId);
+ }
+ 
  BOOL CGMESearch::PreTranslateMessage(MSG* pMsg) 
  {
***************
*** 142,145 ****
--- 148,161 ----
  	if (CGMEDoc::theInstance && mgaObject) {
  		CGMEDoc::theInstance->ShowObject(mgaObject);
+ 	}
+ }
+ 
+ void CGMESearch::LocateObject(LPCTSTR mgaObjectId)
+ {
+ 	if( CGMEDoc::theInstance
+ 	 && CGMEBrowser::theInstance
+ 	 && mgaObjectId)
+ 	{
+ 		CGMEBrowser::theInstance->FocusItem( CComBSTR( mgaObjectId));
  	}
  }