[GME-commit] GMESRC/SDK/BON BONImpl.cpp,1.31,1.32 BONImpl.h,1.18,1.19 Events.h,1.3,1.4

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

Update of /project/gme-repository/GMESRC/SDK/BON
In directory escher:/tmp/cvs-serv1222

Modified Files:
	BONImpl.cpp BONImpl.h Events.h 
Log Message:
EventListeners will react to all events by default (as stated in doc).


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: BONImpl.h
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/BONImpl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** BONImpl.h	15 Nov 2005 22:01:34 -0000	1.18
--- BONImpl.h	6 Jan 2006 19:23:09 -0000	1.19
***************
*** 167,170 ****
--- 167,171 ----
  			void					assignTerritory(TerritoryPtr terr);
  
+ 			bool					isGMEAvailable() const;
  			void					consoleMsg(const std::string& msg, msgtype_enum type);
  			std::string 				getConsoleContents();

Index: Events.h
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/Events.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Events.h	3 Feb 2004 10:53:05 -0000	1.3
--- Events.h	6 Jan 2006 19:23:09 -0000	1.4
***************
*** 84,88 ****
  			virtual MON::ObjectEventTypes getAssignments() const
  			{
! 				return MON::OET_None;
  			}
  
--- 84,88 ----
  			virtual MON::ObjectEventTypes getAssignments() const
  			{
! 				return MON::OET_All;
  			}
  

Index: BONImpl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/SDK/BON/BONImpl.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** BONImpl.cpp	16 Nov 2005 17:39:22 -0000	1.31
--- BONImpl.cpp	6 Jan 2006 19:23:09 -0000	1.32
***************
*** 845,849 ****
  			CComBSTR bstrName("GME.Application");
  			CComQIPtr<IMgaClient> pClient;
! 			COMTHROW(m_spProject->GetClientByName(bstrName, &pClient));
  			if (pClient) {
  				CComQIPtr<IDispatch> pDispatch;
--- 845,851 ----
  			CComBSTR bstrName("GME.Application");
  			CComQIPtr<IMgaClient> pClient;
! 			HRESULT hr = m_spProject->GetClientByName(bstrName, &pClient);
! 			if( FAILED( hr)) 
! 				ASSERTTHROW( Exception( "Can't retrieve GME Application object" ) );
  			if (pClient) {
  				CComQIPtr<IDispatch> pDispatch;
***************
*** 858,861 ****
--- 860,873 ----
  		}
  		return m_gme;
+ 	}
+ 
+ 	bool ProjectImpl::isGMEAvailable() const
+ 	{
+ 		if( m_gme) return true;
+ 		CComBSTR bstrName("GME.Application");
+ 		CComQIPtr<IMgaClient> pClient;
+ 		HRESULT hr = m_spProject->GetClientByName(bstrName, &pClient);
+ 		if( FAILED( hr)) return false;
+ 		return true;
  	}