[GME-commit] GMESRC/GME/Gme GMEApp.cpp,1.132,1.133 GMEVersion.h,1.34,1.35

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

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

Modified Files:
	GMEApp.cpp GMEVersion.h 
Log Message:
MGA addon bug workaround

CVS User: Peter Volgyesi, ISIS (volgy)

Index: GMEVersion.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEVersion.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** GMEVersion.h	9 Aug 2005 20:33:51 -0000	1.34
--- GMEVersion.h	10 Aug 2005 16:13:28 -0000	1.35
***************
*** 4,8 ****
  #define GME_VERSION_MAJOR	5		// MAJOR = Last two digits of Year
  #define GME_VERSION_MINOR	8		// MINOR = Month
! #define GME_VERSION_PLEVEL	9		// PATCH LEVEL = Day
  
  #define _VERSION_STRING2(x)	#x 
--- 4,8 ----
  #define GME_VERSION_MAJOR	5		// MAJOR = Last two digits of Year
  #define GME_VERSION_MINOR	8		// MINOR = Month
! #define GME_VERSION_PLEVEL	10		// PATCH LEVEL = Day
  
  #define _VERSION_STRING2(x)	#x 

Index: GMEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** GMEApp.cpp	11 Jul 2005 17:42:19 -0000	1.132
--- GMEApp.cpp	10 Aug 2005 16:13:28 -0000	1.133
***************
*** 1106,1109 ****
--- 1106,1117 ----
  				if(answer == IDYES) {
  					COMTHROW(mgaProject->Close());
+ 
+ 					// PETER: Create new MgaProject COM object (workaround MGA addon bug)
+ 					COMTHROW(mgaProject.Release());
+ 					COMTHROW( mgaProject.CoCreateInstance(OLESTR("Mga.MgaProject")) );
+ 					#pragma warning(disable: 4310) // cast truncates constant value
+ 					COMTHROW( mgaProject->EnableAutoAddOns(VARIANT_TRUE));
+ 					#pragma warning(default: 4310) // cast truncates constant value
+ 					
  					HRESULT hr = mgaProject->OpenEx(PutInBstr(conn), pname, g2);
  					if(hr == E_MGA_PARADIGM_NOTREG || hr == E_MGA_PARADIGM_INVALID) {