[GME-commit] GMESRC/GME/Gme MainFrm.cpp, 1.43, 1.44 search.cpp, 1.1, 1.2 search.h, 1.2, 1.3 GMESearch.cpp, 1.9, 1.10 GMESearch.h, 1.6, 1.7 GMEBrowser.cpp, 1.32, 1.33 GMEBrowser.h, 1.13, 1.14

[Log messages of CVS commits]

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

Modified Files:
	MainFrm.cpp search.cpp search.h GMESearch.cpp GMESearch.h 
	GMEBrowser.cpp GMEBrowser.h 
Log Message:
Search component's local search.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEBrowser.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEBrowser.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** GMEBrowser.cpp	3 May 2007 18:35:00 -0000	1.32
--- GMEBrowser.cpp	18 Apr 2008 17:06:22 -0000	1.33
***************
*** 49,54 ****
  }
  
! #pragma warning ( disable : 4100 ) // Unreferenced formal param
! bool CGMEBrowser::GetSelectedItem(CComPtr<IMgaObject> &item)
  {
  	HRESULT hr = S_OK;
--- 49,66 ----
  }
  
! bool CGMEBrowser::GetSelectedItems(CComPtr<IMgaObjects> &items)
! {
! 	LPUNKNOWN lpSelObjs = m_GMEActiveBrowser.GetSelectedMgaObjects();
! 	CComQIPtr<IMgaObjects> objs( lpSelObjs);
! 	long cnt = 0;
! 	if( objs) COMTHROW( objs->get_Count( &cnt));
! 	if( cnt > 0)
! 		items = objs;
! 
! 	return cnt > 0;
! }
! 
! //#pragma warning ( disable : 4100 ) // Unreferenced formal param
! bool CGMEBrowser::GetSelectedItem(CComPtr<IMgaObject>&)
  {
  	HRESULT hr = S_OK;
***************
*** 56,60 ****
  	return hr == S_OK;
  }
! #pragma warning ( default : 4100 ) // Unreferenced formal param
  
  void CGMEBrowser::SetProject(CComPtr<IMgaProject> mgaProject)
--- 68,72 ----
  	return hr == S_OK;
  }
! //#pragma warning ( default : 4100 ) // Unreferenced formal param
  
  void CGMEBrowser::SetProject(CComPtr<IMgaProject> mgaProject)

Index: GMESearch.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMESearch.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GMESearch.cpp	4 Dec 2006 18:28:28 -0000	1.9
--- GMESearch.cpp	18 Apr 2008 17:06:22 -0000	1.10
***************
*** 140,143 ****
--- 140,147 ----
  }
  
+ void CGMESearch::SetSelMgaObjects( CComPtr<IMgaObjects> p_mgaObjects)
+ {
+ 	m_search.SelMgaObjects( p_mgaObjects);
+ }
  
  void CGMESearch::CloseProject()

Index: search.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/search.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** search.h	7 Dec 2002 02:26:00 -0000	1.2
--- search.h	18 Apr 2008 17:06:22 -0000	1.3
***************
*** 48,51 ****
--- 48,52 ----
  public:
  	void OpenProject(LPCTSTR connStr);
+ 	void SelMgaObjects(LPUNKNOWN p_selMgaObjs);
  	void AboutBox();
  };

Index: search.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/search.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** search.cpp	6 Dec 2002 20:27:00 -0000	1.1
--- search.cpp	18 Apr 2008 17:06:22 -0000	1.2
***************
*** 39,42 ****
--- 39,48 ----
  }
  
+ void CSearch::SelMgaObjects(LPUNKNOWN p_selMgaObjs)
+ {
+ 	static BYTE parms[] = VTS_UNKNOWN ;
+ 	InvokeHelper(0x3, DISPATCH_METHOD, VT_EMPTY, NULL, parms, p_selMgaObjs);
+ }
+ 
  void CSearch::AboutBox()
  {

Index: GMESearch.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMESearch.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GMESearch.h	2 May 2006 22:04:50 -0000	1.6
--- GMESearch.h	18 Apr 2008 17:06:22 -0000	1.7
***************
*** 56,59 ****
--- 56,60 ----
  public:
  	void SetProject(CComPtr<IMgaProject> mgaProject);
+ 	void SetSelMgaObjects(CComPtr<IMgaObjects> p_mgaObjects);
  	void CloseProject();
  	void ShowObject(LPUNKNOWN selected);

Index: MainFrm.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/MainFrm.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** MainFrm.cpp	10 Apr 2008 23:02:08 -0000	1.43
--- MainFrm.cpp	18 Apr 2008 17:06:22 -0000	1.44
***************
*** 647,650 ****
--- 647,653 ----
  {
  	m_search.ShowWindow(SW_SHOWNORMAL);
+ 	CComPtr<IMgaObjects> objs;
+ 	if( CGMEBrowser::theInstance->GetSelectedItems( objs))
+ 		m_search.SetSelMgaObjects( objs);
  	m_search.SetFocus(); // allows for easy 'Find Next' feature
  	// the user might press ^F whenever she'd like to jump
***************
*** 720,723 ****
--- 723,727 ----
  void CMainFrame::HideFindDlg()
  {
+ 	m_search.SetSelMgaObjects( CComPtr<IMgaObjects>( 0));
  	m_search.ShowWindow( SW_HIDE);
  }

Index: GMEBrowser.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEBrowser.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GMEBrowser.h	3 May 2007 18:35:00 -0000	1.13
--- GMEBrowser.h	18 Apr 2008 17:06:22 -0000	1.14
***************
*** 22,25 ****
--- 22,26 ----
  
  	bool GetSelectedItem(CComPtr<IMgaObject> &item);
+ 	bool GetSelectedItems(CComPtr<IMgaObjects> &items);
  	void SetProject(CComPtr<IMgaProject> mgaProject);
  	void CloseProject();