[GME-commit] GMESRC/GME/Gme GMEOLEIt.cpp,1.4,1.5 GMEOLEIt.h,1.1,1.2

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

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

Modified Files:
	GMEOLEIt.cpp GMEOLEIt.h 
Log Message:
inParent bool parameter added for oleIt.ShowFCO


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEOLEIt.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEIt.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GMEOLEIt.h	15 Apr 2005 18:40:22 -0000	1.1
--- GMEOLEIt.h	7 Nov 2005 18:33:50 -0000	1.2
***************
*** 101,105 ****
  	afx_msg void SetMgaModel(LPDISPATCH); 
  
! 	afx_msg void ShowFCO( LPCTSTR);
  	afx_msg LPDISPATCH Child( LPCTSTR);
  	afx_msg LPDISPATCH Create( LPCTSTR, LPCTSTR);
--- 101,105 ----
  	afx_msg void SetMgaModel(LPDISPATCH); 
  
! 	afx_msg void ShowFCO( LPCTSTR, BOOL);
  	afx_msg LPDISPATCH Child( LPCTSTR);
  	afx_msg LPDISPATCH Create( LPCTSTR, LPCTSTR);
***************
*** 172,176 ****
  		STDMETHOD(Scroll)(THIS_ bar_enum bar, scroll_enum scroll);
  
! 		STDMETHOD(ShowFCO)(THIS_ BSTR path);
  		STDMETHOD(Child)(THIS_ BSTR name, IMgaFCO** child_fco);
  		STDMETHOD(Create)(THIS_ BSTR part, BSTR name, IMgaFCO** new_fco);
--- 172,176 ----
  		STDMETHOD(Scroll)(THIS_ bar_enum bar, scroll_enum scroll);
  
! 		STDMETHOD(ShowFCO)(THIS_ BSTR path, VARIANT_BOOL inparent);
  		STDMETHOD(Child)(THIS_ BSTR name, IMgaFCO** child_fco);
  		STDMETHOD(Create)(THIS_ BSTR part, BSTR name, IMgaFCO** new_fco);

Index: GMEOLEIt.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEIt.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GMEOLEIt.cpp	12 Oct 2005 20:57:30 -0000	1.4
--- GMEOLEIt.cpp	7 Nov 2005 18:33:50 -0000	1.5
***************
*** 571,575 ****
  
  
! 	DISP_FUNCTION(CGMEOLEIt, "ShowFCO", ShowFCO, VT_EMPTY, VTS_BSTR)
  	DISP_FUNCTION(CGMEOLEIt, "Child", Child, VT_DISPATCH, VTS_BSTR)
  	DISP_FUNCTION(CGMEOLEIt, "Create", Create, VT_DISPATCH, VTS_BSTR VTS_BSTR)
--- 571,575 ----
  
  
! 	DISP_FUNCTION(CGMEOLEIt, "ShowFCO", ShowFCO, VT_EMPTY, VTS_BSTR VTS_BOOL)
  	DISP_FUNCTION(CGMEOLEIt, "Child", Child, VT_DISPATCH, VTS_BSTR)
  	DISP_FUNCTION(CGMEOLEIt, "Create", Create, VT_DISPATCH, VTS_BSTR VTS_BSTR)
***************
*** 1087,1091 ****
  }
  
! void CGMEOLEIt::ShowFCO( LPCTSTR p_objName)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEOLEIt::ShowFCO\r\n");
--- 1087,1091 ----
  }
  
! void CGMEOLEIt::ShowFCO( LPCTSTR p_objName, BOOL p_inParent)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEOLEIt::ShowFCO\r\n");
***************
*** 1109,1113 ****
  	if( obj_ptr && CMainFrame::theInstance != NULL )
  	{
! 		CMainFrame::theInstance->mGmeOleApp->ShowFCO( obj_ptr, 0); // 0: show the object , not within the parent
  	}
  }
--- 1109,1113 ----
  	if( obj_ptr && CMainFrame::theInstance != NULL )
  	{
! 		CMainFrame::theInstance->mGmeOleApp->ShowFCO( obj_ptr, p_inParent);
  	}
  }
***************
*** 2736,2740 ****
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::ShowFCO( BSTR directory)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
--- 2736,2740 ----
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::ShowFCO( BSTR directory, VARIANT_BOOL inParent)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
***************
*** 2742,2746 ****
  	TRY_DUAL(IID_IGMEOLEIt)
  	{
! 		pThis->ShowFCO( (LPCTSTR) directory);
  		return NOERROR;
  	}
--- 2742,2746 ----
  	TRY_DUAL(IID_IGMEOLEIt)
  	{
! 		pThis->ShowFCO( (LPCTSTR) directory, inParent);
  		return NOERROR;
  	}