[GME-commit] GMESRC/GME/Gme GMEApp.cpp,1.120,1.121 GMEOLEApp.cpp,1.5,1.6 GMEOLEApp.h,1.2,1.3 GMEVersion.h,1.17,1.18

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

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

Modified Files:
	GMEApp.cpp GMEOLEApp.cpp GMEOLEApp.h GMEVersion.h 
Log Message:
Version handling problems fixed

CVS User: volgy

Index: GMEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** GMEApp.cpp	22 Jul 2004 14:05:36 -0000	1.120
--- GMEApp.cpp	22 Jul 2004 16:14:33 -0000	1.121
***************
*** 1036,1039 ****
--- 1036,1049 ----
  					}
  				}
+ 				if(hr == E_MGA_META_INCOMPATIBILITY && (parv.Length() > 0)) {
+ 					msg = "WARNING: Versioned project is not compatible with the paradigm '" + CString(parn) + "'\n" 
+ 						" (Eg.: Same version string was assigned to incompatible paradims)\n"
+ 						"Do you want to open it based on the paradigm GUID?";
+ 					if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {
+ 						guidpar = parg;
+ 						tryit = true;
+ 						newparname = parn;
+ 					}
+ 				}
  				if(tryit) {
  					hr = mgaProject->OpenEx(PutInBstr(conn), CComBSTR(newparname), guidpar);

Index: GMEOLEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEApp.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GMEOLEApp.cpp	22 Jul 2004 14:05:36 -0000	1.5
--- GMEOLEApp.cpp	22 Jul 2004 16:14:33 -0000	1.6
***************
*** 38,41 ****
--- 38,42 ----
      }
  
+ 	singleton->GetIDispatch(FALSE)->AddRef();
      return singleton;
  }

Index: GMEOLEApp.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEApp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GMEOLEApp.h	22 Jul 2004 14:05:36 -0000	1.2
--- GMEOLEApp.h	22 Jul 2004 16:14:33 -0000	1.3
***************
*** 8,11 ****
--- 8,12 ----
  //
  
+ class CGMEOLEApp;
  
  class CSingletonFactory: public COleObjectFactory

Index: GMEVersion.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEVersion.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GMEVersion.h	20 Jul 2004 16:13:40 -0000	1.17
--- GMEVersion.h	22 Jul 2004 16:14:33 -0000	1.18
***************
*** 4,8 ****
  #define GME_VERSION_MAJOR	4		// MAJOR = Last two digits of Year
  #define GME_VERSION_MINOR	7		// MINOR = Month
! #define GME_VERSION_PLEVEL	20		// PATCH LEVEL = Day
  
  #define _VERSION_STRING2(x)	#x 
--- 4,8 ----
  #define GME_VERSION_MAJOR	4		// MAJOR = Last two digits of Year
  #define GME_VERSION_MINOR	7		// MINOR = Month
! #define GME_VERSION_PLEVEL	22		// PATCH LEVEL = Day
  
  #define _VERSION_STRING2(x)	#x