[commit] r1869 - trunk/GME/ConstraintManager

[GMESRC Repository Notifications]

Author: ksmyth
Date: Thu Mar 22 15:21:53 2012
New Revision: 1869

Log:
Use addon event masks

Modified:
   trunk/GME/ConstraintManager/ConstraintMgr.cpp
   trunk/GME/ConstraintManager/ExpressionChecker.cpp

Modified: trunk/GME/ConstraintManager/ConstraintMgr.cpp
==============================================================================
--- trunk/GME/ConstraintManager/ConstraintMgr.cpp	Thu Mar 22 15:21:37 2012	(r1868)
+++ trunk/GME/ConstraintManager/ConstraintMgr.cpp	Thu Mar 22 15:21:53 2012	(r1869)
@@ -171,8 +171,8 @@
 	if ( ! m_Facade.m_bEnabled || ! m_Facade.m_bEnabledInteractions || ! m_Facade.m_bEnabledEvents ) {
 		return S_OK;
 	}
-	if (eventmask == OBJEVENT_MOUSEOVER)
-		return S_OK;
+	ASSERT(!(eventmask | OBJEVENT_MOUSEOVER)); // shouldn't receive these events because of put_EventMask
+	ASSERT(!(eventmask | OBJEVENT_PRE_DESTROYED));
 
 	COMTRY {
 		return m_Facade.Evaluate( obj, eventmask);
@@ -192,7 +192,7 @@
 
 	COMTRY {
 		COMTHROW( m_spProject->CreateAddOn( m_spEventSink, &m_spAddOn ) );
-		COMTHROW( m_spAddOn->put_EventMask( 0xFFFFFFFF ) );
+		COMTHROW( m_spAddOn->put_EventMask( ~(OBJEVENT_MOUSEOVER | OBJEVENT_PRE_DESTROYED) )  );
 
 		CComPtr<IMgaTerritory> spTerritory;
 		COMTHROW( m_spProject->CreateTerritory( NULL, &spTerritory ) );

Modified: trunk/GME/ConstraintManager/ExpressionChecker.cpp
==============================================================================
--- trunk/GME/ConstraintManager/ExpressionChecker.cpp	Thu Mar 22 15:21:37 2012	(r1868)
+++ trunk/GME/ConstraintManager/ExpressionChecker.cpp	Thu Mar 22 15:21:53 2012	(r1869)
@@ -156,7 +156,8 @@
 				}
 				m_Facade.Finalize();
 			}
-		}
+		} else
+			ASSERT(false); // Shouldn't get other events because of put_EventMask
 
 	} COMCATCH( ASSERT( 0 ); )
 
@@ -175,7 +176,7 @@
 	m_spAddOn = NULL;
 	COMTRY {
 		COMTHROW( m_spProject->CreateAddOn( m_spEventSink, &m_spAddOn ) );
-		COMTHROW( m_spAddOn->put_EventMask( 0xFFFFFFFF ) );
+		COMTHROW( m_spAddOn->put_EventMask( ~(OBJEVENT_ATTR | OBJEVENT_CONNECTED) ) );
 
 		m_Facade.Initialize( p );
 	} COMCATCH( ASSERT( 0 ); )