[GME-commit] GMESRC/GME/Gme GMEConsole.h,1.1,1.2 GMEConsole.cpp,1.1,1.2 GMEApp.cpp,1.125,1.126 console.h,1.1,1.2 console.cpp,1.1,1.2

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

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv12692

Modified Files:
	GMEConsole.h GMEConsole.cpp GMEApp.cpp console.h console.cpp 
Log Message:
console scripting

CVS User: bogyom

Index: GMEConsole.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEConsole.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GMEConsole.h	24 Jul 2004 06:41:53 -0000	1.1
--- GMEConsole.h	2 Dec 2004 22:32:22 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  	CString GetContents();
  	void SetContents(const CString& contents);
+ 	void SetGMEApp(IDispatch *idp);
  
  // Dialog Data

Index: GMEConsole.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEConsole.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GMEConsole.cpp	24 Jul 2004 06:41:53 -0000	1.1
--- GMEConsole.cpp	2 Dec 2004 22:32:22 -0000	1.2
***************
*** 114,116 ****
  {
  	m_Console.SetContents(contents);
! }
\ No newline at end of file
--- 114,121 ----
  {
  	m_Console.SetContents(contents);
! }
! 
! void CGMEConsole::SetGMEApp(IDispatch *idp)
! {
! 	m_Console.SetGMEApp(idp);
! }

Index: GMEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** GMEApp.cpp	14 Sep 2004 14:02:17 -0000	1.125
--- GMEApp.cpp	2 Dec 2004 22:32:22 -0000	1.126
***************
*** 839,842 ****
--- 839,844 ----
  		CComBSTR clientName(OLESTR("GME.Application"));
  		COMTHROW(mgaProject->RegisterClient(clientName, oleApp->GetIDispatch(FALSE), &mgaClient));
+ 		IDispatch *disp = oleApp->GetIDispatch(FALSE);
+ 		((CMainFrame*)m_pMainWnd)->m_console.SetGMEApp(disp); // ????
  		COMTHROW(oleApp->GetIDispatch(FALSE)->Release());	// Do not hold a reference, hopefully the returned client holds it
  
***************
*** 1449,1452 ****
--- 1451,1455 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEApp::OnFileCloseproject\r\n");
+ 	((CMainFrame*)m_pMainWnd)->m_console.SetGMEApp(NULL); // ????
  	SafeCloseProject();
  }
***************
*** 1477,1480 ****
--- 1480,1484 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEApp::OnFileAbortProject\r\n");
+ 	((CMainFrame*)m_pMainWnd)->m_console.SetGMEApp(NULL); // ????
  	if(!mgaProject) return;
  	long l;

Index: console.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/console.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** console.h	24 Jul 2004 06:41:53 -0000	1.1
--- console.h	2 Dec 2004 22:32:22 -0000	1.2
***************
*** 18,21 ****
--- 18,22 ----
  	DECLARE_DYNCREATE(CConsole)
  public:
+ 	~CConsole();	
  	CLSID const& GetClsid()
  	{
***************
*** 50,53 ****
--- 51,55 ----
  	void Clear();
  	void AboutBox();
+ 	void SetGMEApp(IDispatch *idp);
  };
  

Index: console.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/console.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** console.cpp	24 Jul 2004 06:41:53 -0000	1.1
--- console.cpp	2 Dec 2004 22:32:22 -0000	1.2
***************
*** 16,19 ****
--- 16,25 ----
  // CConsole properties
  
+ CConsole::~CConsole()
+ {
+ 	static BYTE parms[] = VTS_DISPATCH;
+ 	InvokeHelper(5, DISPATCH_METHOD, VT_EMPTY, NULL, parms, NULL);
+ }
+ 
  CString CConsole::GetContents()
  {
***************
*** 59,61 ****
--- 65,73 ----
  {
  	InvokeHelper(0xfffffdd8, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
+ }
+ 
+ void CConsole::SetGMEApp(IDispatch *idp)
+ {
+ 	static BYTE parms[] = VTS_DISPATCH;
+ 	InvokeHelper(5, DISPATCH_METHOD, VT_EMPTY, NULL, parms, idp);
  }